summaryrefslogtreecommitdiffstats
path: root/src/tools/moc
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-08-09 15:21:34 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-15 18:02:42 +0200
commitca513feb039262714e204be5174c6ed68b66b70d (patch)
treeb265f8cfebaee646315eb5cf46c55fcb3d1578c7 /src/tools/moc
parent12905fa30f3b92d28dff0e4dc6f32ea516cc42f6 (diff)
don't include qconfig.cpp into moc and uic
whatever it was used for is long gone. Change-Id: Ifab7ae7968b1ab65982b1a6414274b3502bbc3d0 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/tools/moc')
-rw-r--r--src/tools/moc/main.cpp2
-rw-r--r--src/tools/moc/moc.pro2
2 files changed, 1 insertions, 3 deletions
diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index 749cca0911..431c8dd46c 100644
--- a/src/tools/moc/main.cpp
+++ b/src/tools/moc/main.cpp
@@ -42,7 +42,7 @@
#include "preprocessor.h"
#include "moc.h"
#include "outputrevision.h"
-#include <qconfig.cpp>
+
#include <qfile.h>
#include <qfileinfo.h>
#include <qdir.h>
diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro
index d56c2805eb..d39749a318 100644
--- a/src/tools/moc/moc.pro
+++ b/src/tools/moc/moc.pro
@@ -3,8 +3,6 @@ CONFIG += force_bootstrap
DEFINES += QT_MOC QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS
-INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
-
include(moc.pri)
HEADERS += qdatetime_p.h
SOURCES += main.cpp