Add snapshot support for non-cross-compiled builds

Once qmake supports dynamic spec selection (QTBUG-23447), we can
tell it to build mkv8snapshot as a host tool, and then remove the
cross_compile guards from tools.pro and v8.pro.

Change-Id: I016227e80ba8c5832bcca718b08a2b14dc3805e6
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>

diff --git a/src/src.pro b/src/src.pro
index 5d6dc20..8c5f5f7 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS = v8
+CONFIG += ordered
+SUBDIRS = tools v8

diff --git a/src/tools/tools.pro b/src/tools/tools.pro
new file mode 100644 (file)
index 0000000..d96f6fc
--- /dev/null
+++ b/src/tools/tools.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+SUBDIRS =
+!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