diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-03-08 10:33:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 07:04:06 +0100 |
| commit | cbb1be5ea9f152d08b033f307061ecfdd8b986ea (patch) | |
| tree | 028d607261af15ad890fa98f33d42682a47edec3 | |
| parent | eef7a68acdce3735bbe684acfb1efb836b3c8df2 (diff) | |
Remove Q_OS_LINUX_ANDROID.
It is unused in the source code and replaced by Q_OS_LINUX,
Q_OS_ANDROID and Q_OS_ANDROID_NO_SDK depending on usecase.
Change-Id: If8d561540e7583fbac83c0f3506f219c4433e847
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| -rw-r--r-- | mkspecs/common/linux-android.conf | 1 | ||||
| -rw-r--r-- | mkspecs/unsupported/android-g++/qmake.conf | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mkspecs/common/linux-android.conf b/mkspecs/common/linux-android.conf index c6ea362f42..a93ec68e01 100644 --- a/mkspecs/common/linux-android.conf +++ b/mkspecs/common/linux-android.conf @@ -6,7 +6,6 @@ QMAKE_PLATFORM += android include(linux.conf) include(gcc-base-unix.conf) -DEFINES += Q_OS_LINUX_ANDROID DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG QT_QPA_DEFAULT_PLATFORM = minimal diff --git a/mkspecs/unsupported/android-g++/qmake.conf b/mkspecs/unsupported/android-g++/qmake.conf index 8f805f176a..8cd1c0c3bd 100644 --- a/mkspecs/unsupported/android-g++/qmake.conf +++ b/mkspecs/unsupported/android-g++/qmake.conf @@ -47,7 +47,7 @@ include(../../common/gcc-base-unix.conf) CONFIG = qt warn_on release link_prl QT = core gui -DEFINES += Q_OS_LINUX_ANDROID HAVE_ANDROID_OS Q_OS_ANDROID_NO_SDK +DEFINES += HAVE_ANDROID_OS Q_OS_ANDROID_NO_SDK DEFINES += Q_ANDROID_VERSION_MAJOR=$$ANDROID_VERSION_MAJOR DEFINES += Q_ANDROID_VERSION_MINOR=$$ANDROID_VERSION_MINOR DEFINES += QT_NO_PRINTER QT_NO_PRINTDIALOG QT_NO_EXCEPTIONS |