diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-09-01 16:13:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-01 19:16:01 +0200 |
| commit | 2438a5ad48014ca0828ee417616358ea171826aa (patch) | |
| tree | 0ed25f53f93afb10813ac1bcb3fcadc658746cc1 | |
| parent | 7a0a9bd5c4bedba771841822b53181e783292227 (diff) | |
Try to ensure that QT_ARCH is always set when configuring v8
This is a workaround for QTBUG-21224.
For v8 we want to use QT_ARCH as the primary variable for
detecting the target platform. Unfortunately, QT_ARCH isn't
set when v8.pro is parsed using fromfile() from within
another .pro file (namely src/src.pro).
qt_config seems to be the bare minimum that's needed to get
qconfig.pri (which sets QT_ARCH and friends) loaded.
Change-Id: Ideb713724b98dd100560eaf6d7be39df9a22a71e
Reviewed-on: http://codereview.qt.nokia.com/4094
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| -rw-r--r-- | src/v8/v8.pri | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/v8/v8.pri b/src/v8/v8.pri index 4d55bbfd5a..dde953ca0d 100644 --- a/src/v8/v8.pri +++ b/src/v8/v8.pri @@ -1,3 +1,10 @@ +isEmpty(QT_ARCH) { + # We're most likely being parsed in a fromfile() call, in which case the + # QMake environment isn't complete. Load qt_config in an attempt to set + # the variables we need (QT_ARCH and CONFIG, in particular). + load(qt_config) +} + equals(QT_ARCH, x86_64)|contains(CONFIG, x86_64):CONFIG += arch_x86_64 else:equals(QT_ARCH, "i386"):CONFIG += arch_i386 else:equals(QT_ARCH, "arm"):CONFIG += arch_arm |