diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-06 10:49:40 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-06 10:55:40 +0200 |
| commit | a6b6e760ac2f019b9ca42847b9535207966811aa (patch) | |
| tree | cdba2823eb3708f7a40593ff69b81d2be88515ea /src/v8/v8.pri | |
| parent | 48ba459580c9e4ce28dbb2c3ce433175148da5a1 (diff) | |
| parent | 8ed47d961dc7e6f161030654d11cd330a542eadf (diff) | |
Merge remote branch 'gerrit/master' into HEAD
Conflicts:
configure.exe
src/corelib/global/qglobal.h
src/gui/kernel/qplatformnativeinterface_qpa.h
src/gui/widgets/qlinecontrol.cpp
src/gui/widgets/qmenu_mac.mm
src/gui/widgets/qmenu_p.h
src/gui/widgets/qmenubar.cpp
src/gui/widgets/qmenubar_p.h
src/gui/widgets/widgets.pri
src/plugins/platforms/wayland/qwaylandnativeinterface.cpp
src/plugins/platforms/wayland/qwaylandnativeinterface.h
src/src.pro
tests/auto/qdir/tst_qdir.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
tests/auto/qstring/tst_qstring.cpp
Change-Id: I64cf2cefa532ba87a92f632e3595ce6914183e9b
Diffstat (limited to 'src/v8/v8.pri')
| -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 2abf52972c..6300ca989e 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 |