1From 78a4b12b64c26f29e64fe56801e92d1e76f362b0 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Fri, 16 Aug 2019 15:08:41 +0300
4Subject: [PATCH] Fix test installations
5
6Qmake won't ignore install errors anymore.
7
8Upstream-Status: Pending
9Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
10---
11 .../ut_mattributeextensionmanager.pro                      | 7 ++++---
12 tests/ut_mimpluginmanager/ut_mimpluginmanager.pro          | 7 ++++---
13 .../ut_mimpluginmanagerconfig.pro                          | 3 ---
14 3 files changed, 8 insertions(+), 9 deletions(-)
15
16diff --git a/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro b/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro
17index 22280882..d0c390ef 100644
18--- a/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro
19+++ b/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro
20@@ -13,9 +13,10 @@ CONFIG += plugin
21 include($$TOP_DIR/src/libmaliit-plugins.pri)
22 include($$TOP_DIR/connection/libmaliit-connection.pri)
23
24-target.files += \
25-    $$TARGET \
26+extra.files += \
27     toolbar1.xml \
28-    toolbar2.xml \
29+    toolbar2.xml
30+extra.path = $$target.path
31+INSTALLS += extra
32
33 include(../common_check.pri)
34diff --git a/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro b/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro
35index 19e68e6a..44e0fa0f 100644
36--- a/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro
37+++ b/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro
38@@ -17,9 +17,10 @@ include($$TOP_DIR/src/libmaliit-plugins.pri)
39 # For MImInputContextConnection pulled in by TestInputMethodHost
40 include($$TOP_DIR/connection/libmaliit-connection.pri)
41
42-target.files += \
43-    $$TARGET \
44+extra.files += \
45     toolbar1.xml \
46-    toolbar2.xml \
47+    toolbar2.xml
48+extra.path = $$target.path
49+INSTALLS += extra
50
51 include(../common_check.pri)
52diff --git a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro
53index 739ceef6..e0b363c8 100644
54--- a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro
55+++ b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro
56@@ -17,7 +17,4 @@ include($$TOP_DIR/src/libmaliit-plugins.pri)
57 # For MImInputContextConnection pulled in by TestInputMethodHost
58 include($$TOP_DIR/connection/libmaliit-connection.pri)
59
60-target.files += \
61-    $$TARGET \
62-
63 include(../common_check.pri)
64