summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>2013-04-17 15:14:05 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-20 01:35:33 +0200
commit1b289379dc9d2ee1afee535d5db286e7f1eade60 (patch)
treedcef964579a785b42d59cdb250852b8825f57c4b
parent0631caf55560a650d386978713955599362068d5 (diff)
Don't bootstrap QT_EVAL code
For most bootstrapped tools, the QT_EVAL code will not have any effect, because most of the tools don't instantiate a QCoreApplication. However, qdoc is bootstrapped for cross compilation, and will instantiate QCoreApplication which calls the QT_EVAL code. Since the QT_EVAL code requires QObject, and QObject requires moc, it does not make sense to compile the eval code into the bootstrap library. Instead, we simply disable it to make sure the build succeeds. Change-Id: I472803572b070df041014d337c23d3f3dc0749e4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--src/tools/bootstrap/bootstrap.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 4819dbdd07..972f57260e 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -28,6 +28,8 @@ DEFINES += \
QT_CRYPTOGRAPHICHASH_ONLY_SHA1 \
QT_NO_CAST_FROM_ASCII
+DEFINES -= QT_EVAL
+
MODULE_PRIVATE_INCLUDES = \
\$\$QT_MODULE_INCLUDE_BASE \
\$\$QT_MODULE_INCLUDE_BASE/QtCore \