summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch')
-rw-r--r--recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch31
1 files changed, 9 insertions, 22 deletions
diff --git a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
index b3f7621c..7501dc16 100644
--- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
+++ b/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch
@@ -1,4 +1,4 @@
1From 1755b8c7ab87f9e6bf072bd0bef50086c14dd9ff Mon Sep 17 00:00:00 2001 1From 4e4675a65fa5ad687a9ca93540799f157bd328a0 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> 2From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
3Date: Sun, 26 May 2013 14:26:19 +0200 3Date: Sun, 26 May 2013 14:26:19 +0200
4Subject: [PATCH] qmltestexample: fix link 4Subject: [PATCH] qmltestexample: fix link
@@ -15,12 +15,11 @@ Change-Id: I63088ff73bec6a8559dfae132f8bd40b62487450
15Signed-off-by: Eric Bénard <eric@eukrea.com> 15Signed-off-by: Eric Bénard <eric@eukrea.com>
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17--- 17---
18 examples/qmltest/qmltest/qmltest.pro | 2 +- 18 examples/qmltest/qmltest/qmltest.pro | 2 +-
19 tests/auto/qml/qjsengine/qjsengine.pro | 2 +- 19 tests/auto/qml/qjsengine/qjsengine.pro | 2 +-
20 tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | 2 +- 20 tests/auto/qmltest/qmltest.pro | 1 +
21 tests/auto/qmltest/qmltest.pro | 1 + 21 tools/qmltestrunner/qmltestrunner.pro | 2 +-
22 tools/qmltestrunner/qmltestrunner.pro | 2 +- 22 4 files changed, 4 insertions(+), 3 deletions(-)
23 5 files changed, 5 insertions(+), 4 deletions(-)
24 23
25diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro 24diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
26index b5893c5..1b00e6c 100644 25index b5893c5..1b00e6c 100644
@@ -36,31 +35,19 @@ index b5893c5..1b00e6c 100644
36 macx: CONFIG -= app_bundle 35 macx: CONFIG -= app_bundle
37 36
38diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro 37diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro
39index fc2452c..919710f 100644 38index c9d78e2..5861613 100644
40--- a/tests/auto/qml/qjsengine/qjsengine.pro 39--- a/tests/auto/qml/qjsengine/qjsengine.pro
41+++ b/tests/auto/qml/qjsengine/qjsengine.pro 40+++ b/tests/auto/qml/qjsengine/qjsengine.pro
42@@ -1,7 +1,7 @@ 41@@ -1,6 +1,6 @@
43 CONFIG += testcase 42 CONFIG += testcase
44 CONFIG += parallel_test
45 TARGET = tst_qjsengine 43 TARGET = tst_qjsengine
46-QT += qml qml-private widgets testlib gui-private 44-QT += qml qml-private widgets testlib gui-private
47+QT += qml qml-private widgets testlib gui-private quick 45+QT += qml qml-private widgets testlib gui-private quick
48 macx:CONFIG -= app_bundle 46 macx:CONFIG -= app_bundle
49 SOURCES += tst_qjsengine.cpp 47 SOURCES += tst_qjsengine.cpp
50 RESOURCES += qjsengine.qrc 48 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 49diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro
63index 7662cb1..a8f8ae2 100644 50index 54db7a7..8c6986c 100644
64--- a/tests/auto/qmltest/qmltest.pro 51--- a/tests/auto/qmltest/qmltest.pro
65+++ b/tests/auto/qmltest/qmltest.pro 52+++ b/tests/auto/qmltest/qmltest.pro
66@@ -4,6 +4,7 @@ CONFIG += qmltestcase 53@@ -4,6 +4,7 @@ CONFIG += qmltestcase