summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@qt.io>2019-09-23 09:20:12 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2019-09-23 09:56:22 +0200
commit034c731008254970f4d577e8718f32d939ddfbab (patch)
tree5eefd2d4a17d6d9a279e9c27bca7991573dedf5a
parent433c14cdd346cb2fcb24755ce1b6184c77cb0b60 (diff)
Prospective fix for test failures on MinGWv5.14.0-alpha1
After commit 4d289edb14aeb4976218cc306bfc514e37521b82 in qtbase, MinGW is not building with debug-and-release anymore. So similar to the change in qtbase, the .pro files need adjusting for the placement of the plugins to be scoped to debug-and-release configurations. Task-number: QTBUG-78561 Change-Id: I0a5fc029307ba48c8f40f7553a7f583450337690 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro2
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro2
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro2
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro2
-rw-r--r--tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro2
-rw-r--r--tests/auto/unit/qmediaserviceprovider/test/test.pro2
6 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
index 7fcaadbc..813d102c 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
@@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = MockServicePlugin1
load(qt_plugin)
DESTDIR = ../$${PLUGIN_TYPE}
-win32 {
+win32:debug_and_release {
CONFIG(debug, debug|release) {
DESTDIR = ../debug/$${PLUGIN_TYPE}
} else {
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
index 4ac001ec..f2ac3291 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
@@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = MockServicePlugin2
load(qt_plugin)
DESTDIR = ../$${PLUGIN_TYPE}
-win32 {
+win32:debug_and_release {
CONFIG(debug, debug|release) {
DESTDIR = ../debug/$${PLUGIN_TYPE}
} else {
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
index 34cd2fed..51f87d9d 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
@@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = MockServicePlugin3
load(qt_plugin)
DESTDIR = ../$${PLUGIN_TYPE}
-win32 {
+win32:debug_and_release {
CONFIG(debug, debug|release) {
DESTDIR = ../debug/$${PLUGIN_TYPE}
} else {
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
index 0900bfc4..c3834ab0 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
@@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = MockServicePlugin4
load(qt_plugin)
DESTDIR = ../$${PLUGIN_TYPE}
-win32 {
+win32:debug_and_release {
CONFIG(debug, debug|release) {
DESTDIR = ../debug/$${PLUGIN_TYPE}
} else {
diff --git a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
index 37f287f9..b273c6b1 100644
--- a/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
+++ b/tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
@@ -11,7 +11,7 @@ PLUGIN_CLASS_NAME = MockServicePlugin5
load(qt_plugin)
DESTDIR = ../$${PLUGIN_TYPE}
-win32 {
+win32:debug_and_release {
CONFIG(debug, debug|release) {
DESTDIR = ../debug/$${PLUGIN_TYPE}
} else {
diff --git a/tests/auto/unit/qmediaserviceprovider/test/test.pro b/tests/auto/unit/qmediaserviceprovider/test/test.pro
index 2cf78c10..94f7f259 100644
--- a/tests/auto/unit/qmediaserviceprovider/test/test.pro
+++ b/tests/auto/unit/qmediaserviceprovider/test/test.pro
@@ -5,7 +5,7 @@ QT += multimedia-private testlib
SOURCES += ../tst_qmediaserviceprovider.cpp
-win32 {
+win32:debug_and_release {
CONFIG(debug, debug|release) {
TARGET = ../../debug/tst_qmediaserviceprovider
} else {