diff options
| author | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-11-17 14:43:41 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@theqtcompany.com> | 2015-11-20 15:01:26 +0000 |
| commit | 93466161cacfb45b9de94d5cb8f0ee7be28db53a (patch) | |
| tree | f273cbdb24cb70c63d1500a0c4854802fd1958f7 /qmake | |
| parent | de43d4fafd079bfbe0f338b0e7f32068a73d96dc (diff) | |
Rip out the #qmake_warning "preprocessor directive".
No-one is known to use it - we don't even have a test for it. It
plays poorly with the real preprocessor and it has not produced any
output since at least Qt 4.0 (unless qmake is invoked with at least
one -d flag, drowning the output in level 1 debug output).
This incidentally means no preprocessor directive we care about has an
underscore in its keyword.
Task-number: QTBUG-49487
Change-Id: I123a945c1dfe29d1d3ceee1129cfedc043f2e7d4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/makefiledeps.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index 79e017a560..161341d780 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -573,8 +573,7 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file) int keyword_len = 0; const char *keyword = buffer+x; while(x+keyword_len < buffer_len) { - if(((*(buffer+x+keyword_len) < 'a' || *(buffer+x+keyword_len) > 'z')) && - *(buffer+x+keyword_len) != '_') { + if ((*(buffer+x+keyword_len) < 'a' || *(buffer+x+keyword_len) > 'z')) { for(x+=keyword_len; //skip spaces after keyword x < buffer_len && (*(buffer+x) == ' ' || *(buffer+x) == '\t'); x++) ; @@ -603,21 +602,6 @@ bool QMakeSourceFileInfo::findDeps(SourceFile *file) *(buffer + x + inc_len) = '\0'; inc = buffer + x; x += inc_len; - } else if(keyword_len == 13 && !strncmp(keyword, "qmake_warning", keyword_len)) { - char term = 0; - if(*(buffer + x) == '"') - term = '"'; - if(*(buffer + x) == '\'') - term = '\''; - if(term) - x++; - - int msg_len; - for(msg_len = 0; (term && *(buffer + x + msg_len) != term) && - !qmake_endOfLine(*(buffer + x + msg_len)); ++msg_len) ; - *(buffer + x + msg_len) = '\0'; - debug_msg(0, "%s:%d %s -- %s", file->file.local().toLatin1().constData(), line_count, keyword, buffer+x); - x += msg_len; } else if(*(buffer+x) == '\'' || *(buffer+x) == '"') { const char term = *(buffer+(x++)); while(x < buffer_len) { |