diff options
Diffstat (limited to 'recipes-qt/qt5/qtdeclarative')
3 files changed, 0 insertions, 141 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) | ||
diff --git a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch b/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch deleted file mode 100644 index d0d0f8e0..00000000 --- a/recipes-qt/qt5/qtdeclarative/0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 6b1cef42f828cd2374739aa7e3b3800d579315d6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Denys Dmytriyenko <denys@ti.com> | ||
3 | Date: Thu, 31 Mar 2016 19:38:58 -0400 | ||
4 | Subject: [PATCH] qquickviewcomparison: fix QCoreApplication has not been | ||
5 | declared error | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Denys Dmytriyenko <denys@ti.com> | ||
10 | --- | ||
11 | examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | ||
15 | index 5b86c93..e77514e 100644 | ||
16 | --- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | ||
17 | +++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h | ||
18 | @@ -44,6 +44,7 @@ | ||
19 | #include <QWidget> | ||
20 | #include <QQuickWidget> | ||
21 | #include <QQuickView> | ||
22 | +#include <QCoreApplication> | ||
23 | |||
24 | QT_FORWARD_DECLARE_CLASS(QRadioButton) | ||
25 | QT_FORWARD_DECLARE_CLASS(QCheckBox) | ||
diff --git a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch b/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch deleted file mode 100644 index d3ee42ef..00000000 --- a/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001 | ||
2 | From: Jonathan Liu <net147@gmail.com> | ||
3 | Date: Wed, 24 Aug 2016 11:18:37 +1000 | ||
4 | Subject: [PATCH] Workaround crashes in QtQml code related to dead-store | ||
5 | elimination | ||
6 | |||
7 | When compiled in release mode with GCC 6, QtQml may crash. | ||
8 | This is because the C++ compiler is more aggressive about dead-store | ||
9 | elimination in situations where a memory store to a location precedes | ||
10 | the construction of an object at that memory location. | ||
11 | |||
12 | The QV4::MemoryManager::allocate{Managed,Object} functions allocate | ||
13 | memory and write to it before the caller does a placement new to | ||
14 | construct an object in the same memory. The compiler considers these | ||
15 | writes before the constructor as "dead stores" and eliminates them. | ||
16 | |||
17 | The -fno-lifetime-dse compiler flag is added to disable this more | ||
18 | aggressive dead-store eliminiation optimization. | ||
19 | |||
20 | This is a temporary workaround until a proper solution is found. | ||
21 | |||
22 | Upstream-Status: Accepted | ||
23 | |||
24 | Task-number: QTBUG-55482 | ||
25 | Change-Id: I7dbae6e9e613e53ce5fb25957c449bc6657803b5 | ||
26 | Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> | ||
27 | Signed-off-by: Jonathan Liu <net147@gmail.com> | ||
28 | --- | ||
29 | src/qml/qml.pro | 2 +- | ||
30 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
31 | |||
32 | diff --git a/src/qml/qml.pro b/src/qml/qml.pro | ||
33 | index f4862a1..651afa6 100644 | ||
34 | --- a/src/qml/qml.pro | ||
35 | +++ b/src/qml/qml.pro | ||
36 | @@ -18,7 +18,7 @@ exists("qqml_enable_gcov") { | ||
37 | |||
38 | greaterThan(QT_GCC_MAJOR_VERSION, 5) { | ||
39 | # Our code is bad. Temporary workaround. | ||
40 | - QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks | ||
41 | + QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse | ||
42 | } | ||
43 | |||
44 | QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf | ||