From 34a13f140dc26b359b6f41904a75563e6ea0bf5e Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 5 Jan 2012 13:51:57 +0100 Subject: [PATCH] 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 Reviewed-by: Simon Hausmann --- src/src.pro | 3 ++- src/tools/tools.pro | 3 +++ src/v8/v8.pro | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 src/tools/tools.pro diff --git a/src/src.pro b/src/src.pro index 5d6dc20..8c5f5f7 100644 --- 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 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 --- 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 -- 2.7.4