From 1b289379dc9d2ee1afee535d5db286e7f1eade60 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 17 Apr 2013 15:14:05 +0200 Subject: 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 --- src/tools/bootstrap/bootstrap.pro | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') 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 \ -- cgit v1.2.3