From 6823f43bbcad6ed888b5138761ec4c37d7bc1905 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 10 Apr 2013 10:17:30 +0200 Subject: Android: Remove qdevice.pri warning in configure step Use the appropriate way to load the .pri file which also checks for its existence before loading it. Change-Id: I7d36da1593bb7fa1b5f6fd4d10b69e20c6aaa836 Reviewed-by: Oswald Buddenhagen --- mkspecs/android-g++/qmake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs/android-g++') 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? -- cgit v1.2.3