AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Try to ensure that QT_ARCH is always set when configuring v8

Browse Source 
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>
This commit is contained in:
Kent Hansen 2011-09-01 16:13:29 +02:00 committed by Qt by Nokia
parent 7a0a9bd5c4
commit 2438a5ad48
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/v8/v8.pri
View File

@ -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