don't include qconfig.cpp into moc and uic

upstream commits:
https://github.com/qtproject/qtbase/commit/ca513feb039262714e204be5174c6ed68b66b70d

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/tools/moc/mocmain.cpp b/src/tools/moc/mocmain.cpp
index d6718a9..7f51d61 100644 (file)
--- a/src/tools/moc/mocmain.cpp
+++ b/src/tools/moc/mocmain.cpp
@@ -42,7 +42,6 @@
 #include "preprocessor.h"
 #include "moc.h"
 #include "outputrevision.h"
-#include "qconfig.cpp"
 #include <QFile>
 #include <QFileInfo>
 #include <QDir>

diff --git a/src/tools/uic/uicmain.cpp b/src/tools/uic/uicmain.cpp
index a7342e3..ac4914c 100644 (file)
--- a/src/tools/uic/uicmain.cpp
+++ b/src/tools/uic/uicmain.cpp
@@ -42,7 +42,6 @@
 #include "uic.h"
 #include "option.h"
 #include "driver.h"
-#include "qconfig.cpp"
 #include <QtCore/QFile>
 #include <QtCore/QDir>
 #include <QtCore/QTextStream>