From cbb1be5ea9f152d08b033f307061ecfdd8b986ea Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Fri, 8 Mar 2013 10:33:32 +0100 Subject: Remove Q_OS_LINUX_ANDROID. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- mkspecs/unsupported/android-g++/qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/unsupported') 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 -- cgit v1.2.3