summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-10-23 15:08:26 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-24 20:20:59 +0200
commite658f70b852c4c618e330a06a45670d0d342ff6b (patch)
treec4555347ee48724fba237b875e4e94f33b491fcc
parent75454e84eabbf8ace89abe22fc19ff981f2ef07b (diff)
don't explicitly exclude qconfig.h when building moc
it excludes itself for bootstrapped builds. Change-Id: I22fa969c47ff69eab8c96bf0917b0859c65b2fd9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--src/corelib/global/qglobal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index d7253c39c6..1d19a6cf6f 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -55,7 +55,7 @@
*/
#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
-#if !defined(QT_BUILD_MOC) && !defined(QT_BUILD_QMAKE) && !defined(QT_BUILD_CONFIGURE)
+#if !defined(QT_BUILD_QMAKE) && !defined(QT_BUILD_CONFIGURE)
#include <QtCore/qconfig.h>
#endif