diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-12 12:53:13 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-12 12:53:13 +0200 |
| commit | aa3754d1058c08b18dc5c3f38ca9496ce152c584 (patch) | |
| tree | f2df5de02aab5d82a75e63c54f1bb9882ff89583 /mkspecs/android-g++/qmake.conf | |
| parent | a12a67c820fb010bc0396233528d652b717842e6 (diff) | |
| parent | 8c81b282f8e18897257b93cb3fc149d74441c40e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iee73c93067c5822d8dd51a8692e6da9df4ba49f5
Diffstat (limited to 'mkspecs/android-g++/qmake.conf')
| -rw-r--r-- | mkspecs/android-g++/qmake.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index e12bb03560..c780e2f0d5 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -6,10 +6,11 @@ QMAKE_COMPILER = gcc CONFIG += android_install DEFINES += QT_NO_PRINTDIALOG -include(../qdevice.pri) include(../common/linux.conf) include(../common/gcc-base-unix.conf) +load(device_config) + # Passing in -win32 to qmake (from NQTC) causes this condition to pass, however # qmake complains that -win32 is deprecated; should find another way, Q_OS_WIN # should really be all QMAKE_HOST.os needs to depend on? |