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