diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 14:50:37 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-05-28 14:50:37 +0200 |
| commit | 3fa7bb148ed40bd018ce51b5f20c0c8792638568 (patch) | |
| tree | dc7b2847822189d5c0cbc7195fbca3556d6aa6a2 /recipes-qt/qt5/qtdeclarative | |
| parent | 17eb158c6d2cd290b054b5bd54311aa44a02d04d (diff) | |
| download | meta-qt5-3fa7bb148ed40bd018ce51b5f20c0c8792638568.tar.gz | |
qt5: drop recipes for 5.4.1 version
* we don't plan to keep 2 versions, one from tarballs and one from git
now there is 5.4.2 in git recipes and 5.4.1 tarballs aren't very useful
anymore
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative')
| -rw-r--r-- | recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch | 88 |
1 files changed, 0 insertions, 88 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 478862cc..00000000 --- a/recipes-qt/qt5/qtdeclarative/0001-qmltestexample-fix-link.patch +++ /dev/null | |||
| @@ -1,88 +0,0 @@ | |||
| 1 | From ccfd4907a2683fb0840fa4fd6a9d979395f4331c 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/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 | |||
| 25 | diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro | ||
| 26 | index 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 | |||
| 38 | diff --git a/tests/auto/qml/qjsengine/qjsengine.pro b/tests/auto/qml/qjsengine/qjsengine.pro | ||
| 39 | index 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 | ||
| 51 | diff --git a/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro b/tests/auto/qml/qtqmlmodules/qtqmlmodules.pro | ||
| 52 | index 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 | ||
| 62 | diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro | ||
| 63 | index 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 | |||
| 74 | diff --git a/tools/qmltestrunner/qmltestrunner.pro b/tools/qmltestrunner/qmltestrunner.pro | ||
| 75 | index 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 | -- | ||
| 87 | 2.3.1 | ||
| 88 | |||
