Disable snapshots

Back when v8 lived in qtbase, "cross_compile" would evaluate to
true when cross-compiling. But now, inside the qtjsbackend module,
"cross_compile" seems to evaluate to false always, which means
that snapshots are erroneously turned on when building for arm
(snapshots can't be built for arm due to QTBUG-23447).

Disable snapshots until the cause of this issue has been found.

Change-Id: If0c87ec82bf41e32bf4974b10028dcb7fa42b328
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

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

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