diff options
| author | Michele Calgaro <[email protected]> | 2022-01-21 23:32:30 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2022-01-24 10:18:32 +0900 |
| commit | c7f76b122a08ba789ed0f50984651744dc084ae7 (patch) | |
| tree | 5792fc9dac9576755f12e7f69638231b2ba331a2 /qmake | |
| parent | ca53f5edfe7adcfd998100ae2e0ebcb28f738de6 (diff) | |
| download | tqt3-c7f76b122a08ba789ed0f50984651744dc084ae7.tar.gz tqt3-c7f76b122a08ba789ed0f50984651744dc084ae7.zip | |
TQt Designer: use global includes instead of includehints and
remove duplicated include directives if found in UI files.
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 09659a5623bcb28a6234c0fe2357b8eca56c240f)
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefile.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 45bed0184..83b682a13 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -359,14 +359,7 @@ MakefileGenerator::generateDependencies(TQPtrList<MakefileDependDir> &dirs, cons x++; if(*(big_buffer + x) == '<') { x++; - if(total_size_read >= x + 12 && !strncmp(big_buffer + x, "includehint", 11) && - (*(big_buffer + x + 11) == ' ' || *(big_buffer + x + 11) == '>')) { - for(x += 11; *(big_buffer + x) != '>'; x++); - int inc_len = 0; - for(x += 1 ; *(big_buffer + x + inc_len) != '<'; inc_len++); - *(big_buffer + x + inc_len) = '\0'; - inc = big_buffer + x; - } else if(total_size_read >= x + 13 && !strncmp(big_buffer + x, "customwidget", 12) && + if(total_size_read >= x + 13 && !strncmp(big_buffer + x, "customwidget", 12) && (*(big_buffer + x + 12) == ' ' || *(big_buffer + x + 12) == '>')) { for(x += 13; *(big_buffer + x) != '>'; x++); //skip up to > while(x < total_size_read) { |