Prospective fix for running tests in the new CI on OS X

A hack is in place to look for the plugin in ../../../plugins/...
but that won't work if we use bundles.

Change-Id: I963d6267d658a0315641df1a23f4a111fe3b596e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

12 files changed, 24 insertions, 0 deletions

diff --git a/tests/auto/declarative_core/declarative_core.pro b/tests/auto/declarative_core/declarative_core.pro
index 34f54b2a..f6c7a11a 100644
--- a/tests/auto/declarative_core/declarative_core.pro
+++ b/tests/auto/declarative_core/declarative_core.pro
@@ -6,6 +6,8 @@ TARGET = tst_declarative_core
 CONFIG += qmltestcase
 SOURCES += main.cpp
 
+CONFIG -= app_bundle
+
 QT += location quick
 
 OTHER_FILES = *.qml *.js
diff --git a/tests/auto/declarative_ui/declarative_ui.pro b/tests/auto/declarative_ui/declarative_ui.pro
index 1936fbc6..89518a5c 100644
--- a/tests/auto/declarative_ui/declarative_ui.pro
+++ b/tests/auto/declarative_ui/declarative_ui.pro
@@ -6,6 +6,8 @@ TARGET = tst_declarative_ui
 !no_ui_tests:CONFIG += qmltestcase
 SOURCES += main.cpp
 
+CONFIG -= app_bundle
+
 QT += location quick
 
 OTHER_FILES = *.qml
diff --git a/tests/auto/positionplugintest/positionplugintest.pro b/tests/auto/positionplugintest/positionplugintest.pro
index da68f966..58c8076a 100644
--- a/tests/auto/positionplugintest/positionplugintest.pro
+++ b/tests/auto/positionplugintest/positionplugintest.pro
@@ -4,5 +4,7 @@ TARGET=tst_positionplugin
 
 SOURCES += tst_positionplugin.cpp
 
+CONFIG -= app_bundle
+
 QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeoareamonitor/qgeoareamonitor.pro b/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
index 35581bca..f744bd59 100644
--- a/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
+++ b/tests/auto/qgeoareamonitor/qgeoareamonitor.pro
@@ -9,5 +9,7 @@ HEADERS += logfilepositionsource.h
 
 OTHER_FILES += *.txt
 
+CONFIG -= app_bundle
+
 QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeocodingmanager/qgeocodingmanager.pro b/tests/auto/qgeocodingmanager/qgeocodingmanager.pro
index d39bfd9c..f88113d8 100644
--- a/tests/auto/qgeocodingmanager/qgeocodingmanager.pro
+++ b/tests/auto/qgeocodingmanager/qgeocodingmanager.pro
@@ -7,5 +7,7 @@ HEADERS += ../utils/qlocationtestutils_p.h \
 SOURCES += tst_qgeocodingmanager.cpp \
            ../utils/qlocationtestutils.cpp
 
+CONFIG -= app_bundle
+
 QT += location testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
index 0a49168f..79847fec 100644
--- a/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
+++ b/tests/auto/qgeopositioninfosource/qgeopositioninfosource.pro
@@ -10,5 +10,7 @@ SOURCES += ../utils/qlocationtestutils.cpp \
            testqgeopositioninfosource.cpp \
            tst_qgeopositioninfosource.cpp
 
+CONFIG -= app_bundle
+
 QT += positioning testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeoroutingmanager/qgeoroutingmanager.pro b/tests/auto/qgeoroutingmanager/qgeoroutingmanager.pro
index 4d68b1bd..d6416a87 100644
--- a/tests/auto/qgeoroutingmanager/qgeoroutingmanager.pro
+++ b/tests/auto/qgeoroutingmanager/qgeoroutingmanager.pro
@@ -6,5 +6,7 @@ HEADERS += tst_qgeoroutingmanager.h
 
 SOURCES += tst_qgeoroutingmanager.cpp
 
+CONFIG -= app_bundle
+
 QT += location testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qgeoserviceprovider/qgeoserviceprovider.pro b/tests/auto/qgeoserviceprovider/qgeoserviceprovider.pro
index 793d7ac5..5dfe2dde 100644
--- a/tests/auto/qgeoserviceprovider/qgeoserviceprovider.pro
+++ b/tests/auto/qgeoserviceprovider/qgeoserviceprovider.pro
@@ -4,4 +4,6 @@ TARGET=tst_qgeoserviceprovider
 
 SOURCES += tst_qgeoserviceprovider.cpp
 
+CONFIG -= app_bundle
+
 QT += testlib location
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro
index c6105d82..bbe7b4d8 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro
@@ -18,6 +18,8 @@ SOURCES += ../../utils/qlocationtestutils.cpp \
            tst_qnmeapositioninfosource_realtime_generic.cpp
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 
+CONFIG -= app_bundle
+
 # This test relies on a working local QTcpSocket(Server). When the CI is under
 # heavy load the socket code cannot establish a connection which leads to flaky
 # test results. We make this test insiginficant as there is currently no known
diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro
index f3bd50a0..7c181173 100644
--- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro
+++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro
@@ -18,6 +18,8 @@ SOURCES += ../../utils/qlocationtestutils.cpp \
            tst_qnmeapositioninfosource_simulation_generic.cpp
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
 
+CONFIG -= app_bundle
+
 # This test relies on a working local QTcpSocket(Server). When the CI is under
 # heavy load the socket code cannot establish a connection which leads to flaky
 # test results. We make this test insiginficant as there is currently no known
diff --git a/tests/auto/qplacemanager/qplacemanager.pro b/tests/auto/qplacemanager/qplacemanager.pro
index 2c632a7f..9703ae23 100644
--- a/tests/auto/qplacemanager/qplacemanager.pro
+++ b/tests/auto/qplacemanager/qplacemanager.pro
@@ -4,5 +4,7 @@ TARGET = tst_qplacemanager
 
 SOURCES += tst_qplacemanager.cpp
 
+CONFIG -= app_bundle
+
 QT += location testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/qplacemanager_unsupported/qplacemanager_unsupported.pro b/tests/auto/qplacemanager_unsupported/qplacemanager_unsupported.pro
index ec1f5cdb..0069d080 100644
--- a/tests/auto/qplacemanager_unsupported/qplacemanager_unsupported.pro
+++ b/tests/auto/qplacemanager_unsupported/qplacemanager_unsupported.pro
@@ -4,5 +4,7 @@ TARGET = tst_qplacemanager_unsupported
 
 SOURCES += tst_qplacemanager_unsupported.cpp
 
+CONFIG -= app_bundle
+
 QT += location testlib
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0