diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 10:51:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 10:51:34 +0100 |
| commit | 3061dc4abdfbd1a536918935d380872de6655521 (patch) | |
| tree | ff440ed0c7d5816cc7e2874f73fdabfb0bce493f /mkspecs | |
| parent | 25b2b682d616dd52c3515f443e3d25fc0224f3a2 (diff) | |
| parent | 9b8570c4e9359eb8b45b39c28aa9d8c140f3fc44 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I83ff8f4d7dffd7385013a1bd8a1732a89ee20d56
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/android-g++/qmake.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 11d62a1efb..e3fa924e23 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -4,7 +4,6 @@ QMAKE_PLATFORM = android QMAKE_COMPILER = gcc CONFIG += android_install unversioned_soname android_deployment_settings -DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG include(../common/linux.conf) include(../common/gcc-base-unix.conf) |