Re-enable snapshots for non-cross-compiled builds

This reverts commit 9a006574a7036d0d47b359dcf2598860ddbfa399.

Since commit 3c47b52bd37488d41a3ad068de7976c838b7d63c in qtbase
("Add cross_compile to qconfig.pri for global advertising"), the
cross_compile variable is available to modules outside of qtbase
again, so we can use it.

Change-Id: I2797d75af362cea02cfda519ea772d610e504da4
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>

diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 81767a4..d96f6fc 100644 (file)
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -1,3 +1,3 @@
 TEMPLATE = subdirs
 SUBDIRS =
-false:contains(QT_CONFIG, v8snapshot): SUBDIRS += mkv8snapshot
+!cross_compile:contains(QT_CONFIG, v8snapshot): SUBDIRS += mkv8snapshot

diff --git a/src/v8/v8.pro b/src/v8/v8.pro
index 0dec2f8..f4959c7 100644 (file)
--- a/src/v8/v8.pro
+++ b/src/v8/v8.pro
@@ -26,7 +26,7 @@ HEADERS += qtv8version.h
 
 include(v8.pri)
 
-false:contains(QT_CONFIG, v8snapshot) {
+!cross_compile:contains(QT_CONFIG, v8snapshot) {
     mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT}
     DUMMY_FILE = v8.pro
     mkv8snapshot.input = DUMMY_FILE