diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-16 15:17:27 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-08-20 05:40:41 +0000 |
| commit | f139f2895b699fb0898f6d733b5807c934d48cf1 (patch) | |
| tree | c05f12a1f48a47efc25256f2b89f822ac6ed862b | |
| parent | b9313110bd4ec9a30a037f2edd78b02bf57ed6eb (diff) | |
maliit-framework-qt5: fix test installations
The install rules have been broken, but so far qmake has been
ignoring the errors.
Change-Id: Ib913d1bb0b04f7e4125f508d430dddf65f4f2afd
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch | 62 | ||||
| -rw-r--r-- | recipes-qt/maliit/maliit-framework-qt5_git.bb | 1 |
2 files changed, 63 insertions, 0 deletions
diff --git a/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch new file mode 100644 index 00000000..d86be1e1 --- /dev/null +++ b/recipes-qt/maliit/maliit-framework-qt5/0001-Fix-test-installations.patch @@ -0,0 +1,62 @@ +From 78a4b12b64c26f29e64fe56801e92d1e76f362b0 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo <samuli.piippo@qt.io> +Date: Fri, 16 Aug 2019 15:08:41 +0300 +Subject: [PATCH] Fix test installations + +Qmake won't ignore install errors anymore. + +Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> +--- + .../ut_mattributeextensionmanager.pro | 7 ++++--- + tests/ut_mimpluginmanager/ut_mimpluginmanager.pro | 7 ++++--- + .../ut_mimpluginmanagerconfig.pro | 3 --- + 3 files changed, 8 insertions(+), 9 deletions(-) + +diff --git a/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro b/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro +index 22280882..d0c390ef 100644 +--- a/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro ++++ b/tests/ut_mattributeextensionmanager/ut_mattributeextensionmanager.pro +@@ -13,9 +13,10 @@ CONFIG += plugin + include($$TOP_DIR/src/libmaliit-plugins.pri) + include($$TOP_DIR/connection/libmaliit-connection.pri) + +-target.files += \ +- $$TARGET \ ++extra.files += \ + toolbar1.xml \ +- toolbar2.xml \ ++ toolbar2.xml ++extra.path = $$target.path ++INSTALLS += extra + + include(../common_check.pri) +diff --git a/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro b/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro +index 19e68e6a..44e0fa0f 100644 +--- a/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro ++++ b/tests/ut_mimpluginmanager/ut_mimpluginmanager.pro +@@ -17,9 +17,10 @@ include($$TOP_DIR/src/libmaliit-plugins.pri) + # For MImInputContextConnection pulled in by TestInputMethodHost + include($$TOP_DIR/connection/libmaliit-connection.pri) + +-target.files += \ +- $$TARGET \ ++extra.files += \ + toolbar1.xml \ +- toolbar2.xml \ ++ toolbar2.xml ++extra.path = $$target.path ++INSTALLS += extra + + include(../common_check.pri) +diff --git a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro +index 739ceef6..e0b363c8 100644 +--- a/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro ++++ b/tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.pro +@@ -17,7 +17,4 @@ include($$TOP_DIR/src/libmaliit-plugins.pri) + # For MImInputContextConnection pulled in by TestInputMethodHost + include($$TOP_DIR/connection/libmaliit-connection.pri) + +-target.files += \ +- $$TARGET \ +- + include(../common_check.pri) diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index c767d2a1..1f0dc8d6 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb @@ -12,6 +12,7 @@ SRC_URI = "git://github.com/maliit/framework.git;branch=master \ file://0001-config.pri-Use-O1-optimization-in-DEBUG-flags.patch \ file://0001-Drop-tr1-namespace-its-not-there-in-c-11-and-newer.patch \ file://0001-examples-plugins-Replace-obsolete-screenGeometry.patch \ + file://0001-Fix-test-installations.patch \ " SRCREV = "60b1b10de14f932420313c547ab801daf522d539" |