From 05a2de3ce96eb55a4b9072a94c2ade772a8488ac Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 3 Jul 2023 17:23:55 +0200 Subject: [PATCH] Remove redundant qt_no_master_include from deprecated headers 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 (cherry picked from commit afc8260359191b5e5b2f2c0a124e2094c01f7e1a) Reviewed-by: Qt Cherry-pick Bot --- src/tools/syncqt/main.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/tools/syncqt/main.cpp b/src/tools/syncqt/main.cpp index dbb3d30aaa9..439b8b503a0 100644 --- a/src/tools/syncqt/main.cpp +++ b/src/tools/syncqt/main.cpp @@ -1465,11 +1465,6 @@ public: << "# pragma message (\"" << warningText << "\")\n" << "#endif\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"; writeIfDifferent(m_commandLineArgs->includeDir() + '/' + it->first, buffer.str()); }