summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch')
-rw-r--r--recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch88
1 files changed, 88 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
new file mode 100644
index 00000000..78ef3e11
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative-git/0001-qmltestexample-fix-link.patch
@@ -0,0 +1,88 @@
1From 3bab0b12be56ec7c85c5648a304aba98dc09ed60 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH] qmltestexample: fix link
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9else we get :
10ld: warning: libQt5Quick.so.5, needed by libQt5QuickTest.so, not found
11
12Upstream-Status: Inappropriate
13
14Change-Id: I63088ff73bec6a8559dfae132f8bd40b62487450
15Signed-off-by: Eric Bénard <eric@eukrea.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17---
18 examples/qmltest/qmltest/qmltest.pro | 2 +-
19 tests/auto/qml/qjsengine/qjsengine.pro | 2 +-
20 tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | 2 +-
21 tests/auto/qmltest/qmltest.pro | 1 +
22 tools/qmltestrunner/qmltestrunner.pro | 2 +-
23 5 files changed, 5 insertions(+), 4 deletions(-)
24
25diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
26index b5893c5..1b00e6c 100644
27--- a/examples/qmltest/qmltest/qmltest.pro
28+++ b/examples/qmltest/qmltest/qmltest.pro
29@@ -14,7 +14,7 @@ TESTDATA += tst_basic.qml tst_item.qml
30 # This code exists solely for the purpose of building this example
31 # inside the examples/ hierarchy.
32
33-QT += qml qmltest
34+QT += qml qmltest quick
35
36 macx: CONFIG -= app_bundle
37
38diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro
39index fc2452c..919710f 100644
40--- a/tests/auto/qml/qjsengine/qjsengine.pro
41+++ b/tests/auto/qml/qjsengine/qjsengine.pro
42@@ -1,7 +1,7 @@
43 CONFIG += testcase
44 CONFIG += parallel_test
45 TARGET = tst_qjsengine
46-QT += qml qml-private widgets testlib gui-private
47+QT += qml qml-private widgets testlib gui-private quick
48 macx:CONFIG -= app_bundle
49 SOURCES += tst_qjsengine.cpp
50 RESOURCES += qjsengine.qrc
51diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro
52index c6d442e..3181dcd 100644
53--- a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro
54+++ b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro
55@@ -8,5 +8,5 @@ macx:CONFIG -= app_bundle
56
57 TESTDATA = data/*
58
59-QT += core-private qml-private testlib gui gui-private
60+QT += core-private qml-private testlib gui gui-private quick
61 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
62diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
63index 7662cb1..a8f8ae2 100644
64--- a/tests/auto/qmltest/qmltest.pro
65+++ b/tests/auto/qmltest/qmltest.pro
66@@ -4,6 +4,7 @@ CONFIG += qmltestcase
67 CONFIG += console
68 SOURCES += tst_qmltest.cpp
69
70+QT += quick
71
72 importFiles.files = borderimage buttonclick createbenchmark events qqmlbinding selftests
73
74diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro
75index 1bb913e..56f2dd5 100644
76--- a/tools/qmltestrunner/qmltestrunner.pro
77+++ b/tools/qmltestrunner/qmltestrunner.pro
78@@ -1,6 +1,6 @@
79 SOURCES += main.cpp
80
81-QT += qml qmltest
82+QT += qml qmltest quick
83 CONFIG += no_import_scan
84
85 load(qt_tool)
86--
872.1.1
88