From 09659a5623bcb28a6234c0fe2357b8eca56c240f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 21 Jan 2022 23:32:30 +0900 Subject: TQt Designer: use global includes instead of includehints and remove duplicated include directives if found in UI files. Signed-off-by: Michele Calgaro --- qmake/generators/makefile.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'qmake') diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index 38f881f66..d11243728 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -359,14 +359,7 @@ MakefileGenerator::generateDependencies(TQPtrList &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) { -- cgit v1.2.1