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>
This commit is contained in:
parent
eef7a68acd
commit
cbb1be5ea9
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user