From ca513feb039262714e204be5174c6ed68b66b70d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 9 Aug 2013 15:21:34 +0200
Subject: [PATCH] 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>
---
 src/tools/moc/main.cpp | 2 +-
 src/tools/moc/moc.pro  | 2 --
 src/tools/uic/main.cpp | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp
index 749cca0911b..431c8dd46c8 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 d56c2805ebf..d39749a318c 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
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index f5a13016665..a9bbc237a65 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -42,7 +42,7 @@
 #include "uic.h"
 #include "option.h"
 #include "driver.h"
-#include "../../corelib/global/qconfig.cpp"
+
 #include <qfile.h>
 #include <qdir.h>
 #include <qtextstream.h>