1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant qt_no_master_include from deprecated headers

Browse Source 
qt_no_master_include is not used  in the deprecated headers since
are generated by syncqt, are never scanned and master include logic
is controlled by syncqt.

Change-Id: If6f737938abe67349c8f88387ccb5efdb95afabd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit afc8260359191b5e5b2f2c0a124e2094c01f7e1a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2023-07-03 17:23:55 +02:00 committed by Qt Cherry-pick Bot
parent 433e5223d6
commit 05a2de3ce9
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/syncqt/main.cpp
View File

@ -1465,11 +1465,6 @@ public:
<< "# pragma message (\"" << warningText << "\")\n" << "# pragma message (\"" << warningText << "\")\n"
<< "#endif\n" << "#endif\n"
<< "#include <" << replacement << ">\n" << "#include <" << replacement << ">\n"
<< "#if 0\n"
// TODO: Looks like qt_no_master_include is useless since deprecated headers are
// generated by syncqt but are never scanned.
<< "#pragma qt_no_master_include\n"
<< "#endif\n"
<< "#endif\n"; << "#endif\n";
writeIfDifferent(m_commandLineArgs->includeDir() + '/' + it->first, buffer.str()); writeIfDifferent(m_commandLineArgs->includeDir() + '/' + it->first, buffer.str());
} }