From 152851dcc4ab7e8fc3c09bc00201e74090b198fa Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Mon, 7 May 2012 09:17:34 +0200 Subject: [PATCH] Re-enable snapshots for non-cross-compiled builds MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Jędrzej Nowacki --- src/tools/tools.pro | 2 +- src/v8/v8.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 81767a4..d96f6fc 100644 --- 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 --- 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