5 files changed, 13 insertions, 10 deletions
diff --git a/tests/qml/resources/apps/app1/app1.pro b/tests/qml/resources/apps/app1/app1.pro
index cbbb4758..e16704f7 100644
--- a/tests/qml/resources/apps/app1/app1.pro
+++ b/tests/qml/resources/apps/app1/app1.pro
@@ -3,6 +3,8 @@ TARGET = app1plugin
 CONFIG += plugin
 RESOURCES = app1plugin.qrc
 
+CONFIG -= debug_and_release
+
 RESOURCE_SOURCE = app1file.qrc
 load(generate-resource)
 
diff --git a/tests/qml/resources/resources.pro b/tests/qml/resources/resources.pro
index 6da64f00..7f1e19e1 100644
--- a/tests/qml/resources/resources.pro
+++ b/tests/qml/resources/resources.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = test.pro \
+          systemplugin.pro \
           appcommon \
           apps/app1 \
           apps/app2
diff --git a/tests/qml/resources/systemplugin.pro b/tests/qml/resources/systemplugin.pro
new file mode 100644
index 00000000..1e170c18
--- /dev/null
+++ b/tests/qml/resources/systemplugin.pro
@@ -0,0 +1,8 @@
+RESOURCE_SOURCE = systemuifile.qrc
+load(generate-resource)
+
+TEMPLATE = lib
+TARGET = systemuiplugin
+CONFIG += plugin
+CONFIG -= debug_and_release
+RESOURCES = systemuiplugin.qrc
diff --git a/tests/qml/resources/test.pro b/tests/qml/resources/test.pro
index 3553c02a..be0e9141 100644
--- a/tests/qml/resources/test.pro
+++ b/tests/qml/resources/test.pro
@@ -8,11 +8,3 @@ FILES = am-config.yaml \
         apps/app2/icon.png apps/app2/info.yaml
 DESTDIR = $$OUT_PWD
 load(am-qml-testcase)
-
-RESOURCE_SOURCE = systemuifile.qrc
-load(generate-resource)
-
-TEMPLATE = lib
-TARGET = systemuiplugin
-CONFIG += plugin
-RESOURCES = systemuiplugin.qrc
diff --git a/tests/qml/simple/tst_applicationmanager.qml b/tests/qml/simple/tst_applicationmanager.qml
index 92718be0..b5169f2d 100644
--- a/tests/qml/simple/tst_applicationmanager.qml
+++ b/tests/qml/simple/tst_applicationmanager.qml
@@ -306,10 +306,10 @@ TestCase {
                         exitCode: 0, exitStatus: Am.NormalExit },
                     {tag: "ForceKill", appId: "tld.test.simple2", index: 1, forceKill: true,
                         exitCode: Qt.platform.os !== 'windows' ? 9 : 0,
-                        exitStatus: Qt.platform.os !== 'windows' ? Am.ForcedExit : Am.CrashExit },
+                        exitStatus: Am.ForcedExit },
                     {tag: "AutoTerminate", appId: "tld.test.simple2", index: 1, forceKill: false,
                         exitCode: Qt.platform.os !== 'windows' ? 15 : 0,
-                        exitStatus: Qt.platform.os !== 'windows' ? Am.ForcedExit : Am.CrashExit }
+                        exitStatus: Am.ForcedExit }
                 ];
     }