From f2e98192d9d83376d134c4abde6648f81ad4be16 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 1 Nov 2016 13:15:47 -0700 Subject: [PATCH] Remove unnecessary CONFIG-=simulator from qtConfTest_compile This was added in 28f5d7931656d210364a0aba0b87f1b412e10165 in conjunction with CONFIG+=single_arch, but CONFIG+=single_arch on its own is enough to properly disable unwanted architectures for configure tests in simulator+device builds now that exclusive simulator and device builds have been removed for all relevant configurations. This change therefore fixes the -sdk iphonesimulator build for the upcoming merge from 5.8. Change-Id: I57fa2c4f0782a84755a39c6edfce2dcfec554c40 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_configure.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 9d870faeac..59124d386c 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -721,7 +721,7 @@ defineTest(qtConfTest_compile) { qmake_args += -qtconf $$system_quote($$QMAKE_QTCONF) # Disable qmake features which are typically counterproductive for tests - qmake_args += "\"CONFIG -= qt debug_and_release simulator app_bundle lib_bundle\"" + qmake_args += "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" # allow tests to behave differently depending on the type of library # being built (shared/static). e.g. see config.tests/unix/icu