summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-09-12 16:02:04 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-09-12 16:32:08 +0300
commitd7ebb6ce9b49eb52c325e73d92157d874e9cf907 (patch)
tree1b0041afde4900752d8d589a8f9aa3c8484c3240 /recipes-qt/qt5
parentc82a99ecbeff88ff8a1f6eaa272a352e97992ab1 (diff)
parent4656ab3636c099906989e0d923e1ac7a8ffe7b31 (diff)
downloadmeta-qt5-d7ebb6ce9b49eb52c325e73d92157d874e9cf907.tar.gz
Merge remote-tracking branch 'meta-qt5/master' into 5.7
* meta-qt5/master: qt5-opengles2-test: Add recipe libqofono: import from meta-luneos layer libconnman-qt5: move to recipes-connectivity and don't use MeeGo as prefix qtdeclarative: add upstream patch to fix QtQml crash with GCC 6 qtvirtualkeyboard: add PACKAGECONFIG options qtbase: avoid QA warning if PACKAGECONFIG_RELEASE = "debug" qtbase: Fix build with QT_NO_OPENGL Change-Id: I5b1efc0de3fdf0d4fe98135c0cc08ddb3d03293b
Diffstat (limited to 'recipes-qt/qt5')
-rw-r--r--recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch33
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch44
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb1
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb42
5 files changed, 121 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch b/recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch
new file mode 100644
index 00000000..7b681dce
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch
@@ -0,0 +1,33 @@
1From 2e176e3d10535e4fdaa6ecc919538f66f4a2930d Mon Sep 17 00:00:00 2001
2From: Andy Nichols <andy.nichols@qt.io>
3Date: Mon, 11 Jul 2016 09:18:33 +0200
4Subject: QWidgetBackingStore: Fix build with QT_NO_OPENGL
5
6A define moved out of the #ifndef QT_NO_OPENGL scope.
7
8Change-Id: I41c943b97f165b5171581e01f3a4b2d3fb25747e
9Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
10
11Upstream-Status: Backport
12Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
13---
14 src/widgets/kernel/qwidgetbackingstore.cpp | 2 ++
15 1 file changed, 2 insertions(+)
16
17diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp
18index 32aabce..242e625 100644
19--- a/src/widgets/kernel/qwidgetbackingstore.cpp
20+++ b/src/widgets/kernel/qwidgetbackingstore.cpp
21@@ -67,7 +67,9 @@ QT_BEGIN_NAMESPACE
22
23 extern QRegion qt_dirtyRegion(QWidget *);
24
25+#ifndef QT_NO_OPENGL
26 Q_GLOBAL_STATIC(QPlatformTextureList, qt_dummy_platformTextureList)
27+#endif
28
29 /**
30 * Flushes the contents of the \a backingStore into the screen area of \a widget.
31--
32cgit v1.0-4-g1e03
33
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index c907b93c..a6a18948 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -26,6 +26,7 @@ SRC_URI += "\
26 file://0008-configure-paths-for-target-qmake-properly.patch \ 26 file://0008-configure-paths-for-target-qmake-properly.patch \
27 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \ 27 file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \
28 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 28 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
29 file://0013-Fix-build-with-QT_NO_OPENGL.patch \
29" 30"
30 31
31DEPENDS += "qtbase-native" 32DEPENDS += "qtbase-native"
@@ -67,6 +68,7 @@ PACKAGECONFIG ?= " \
67" 68"
68 69
69PACKAGECONFIG[release] = "-release,-debug" 70PACKAGECONFIG[release] = "-release,-debug"
71PACKAGECONFIG[debug] = ""
70PACKAGECONFIG[developer] = "-developer-build" 72PACKAGECONFIG[developer] = "-developer-build"
71PACKAGECONFIG[sm] = "-sm,-no-sm" 73PACKAGECONFIG[sm] = "-sm,-no-sm"
72PACKAGECONFIG[tests] = "-make tests,-nomake tests" 74PACKAGECONFIG[tests] = "-make tests,-nomake tests"
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
new file mode 100644
index 00000000..d3ee42ef
--- /dev/null
+++ b/recipes-qt/qt5/qtdeclarative/0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch
@@ -0,0 +1,44 @@
1From fcc2c95421710f98c7b2dec73e2c8b0d9164bc9b Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Wed, 24 Aug 2016 11:18:37 +1000
4Subject: [PATCH] Workaround crashes in QtQml code related to dead-store
5 elimination
6
7When compiled in release mode with GCC 6, QtQml may crash.
8This is because the C++ compiler is more aggressive about dead-store
9elimination in situations where a memory store to a location precedes
10the construction of an object at that memory location.
11
12The QV4::MemoryManager::allocate{Managed,Object} functions allocate
13memory and write to it before the caller does a placement new to
14construct an object in the same memory. The compiler considers these
15writes before the constructor as "dead stores" and eliminates them.
16
17The -fno-lifetime-dse compiler flag is added to disable this more
18aggressive dead-store eliminiation optimization.
19
20This is a temporary workaround until a proper solution is found.
21
22Upstream-Status: Accepted
23
24Task-number: QTBUG-55482
25Change-Id: I7dbae6e9e613e53ce5fb25957c449bc6657803b5
26Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
27Signed-off-by: Jonathan Liu <net147@gmail.com>
28---
29 src/qml/qml.pro | 2 +-
30 1 file changed, 1 insertion(+), 1 deletion(-)
31
32diff --git a/src/qml/qml.pro b/src/qml/qml.pro
33index 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
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 6d268cac..6bab3725 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -19,6 +19,7 @@ DEPENDS += "qtbase"
19SRC_URI += " \ 19SRC_URI += " \
20 file://0001-qmltestexample-fix-link.patch \ 20 file://0001-qmltestexample-fix-link.patch \
21 file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \ 21 file://0002-qquickviewcomparison-fix-QCoreApplication-has-not-be.patch \
22 file://0003-Workaround-crashes-in-QtQml-code-related-to-dead-sto.patch \
22" 23"
23 24
24EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" 25EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index ff478f3f..7e2f445e 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -1,11 +1,51 @@
1require qt5.inc 1require qt5.inc
2require qt5-git.inc 2require qt5-git.inc
3 3
4LICENSE = "GPL-3.0" 4LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
5LIC_FILES_CHKSUM = " \ 5LIC_FILES_CHKSUM = " \
6 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ 6 file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
7" 7"
8 8
9# To enabled Nuance T9 Write support, you need to provide the licensed components
10# and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
11# for example:
12#T9WRITEPACKAGE = "${HOME}/Downloads/zzEval_QT_T9Write_Alpha_v750_20150916.zip"
13#SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write"
14#PACKAGECONFIG = "t9write lang-all"
15
16PACKAGECONFIG ?= "lang-all lipi-toolkit"
17PACKAGECONFIG[hunspell] = ",CONFIG+=disable-hunspell,hunspell"
18PACKAGECONFIG[t9write] = "CONFIG+=t9write"
19PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit"
20PACKAGECONFIG[lang-all] = "CONFIG+=lang-all"
21PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR"
22PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK"
23PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE"
24PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB"
25PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES"
26PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA"
27PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI"
28PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR"
29PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN"
30PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT"
31PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP"
32PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR"
33PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO"
34PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL"
35PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT"
36PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU"
37PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE"
38PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN"
39PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW"
40
41EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
42EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'CONFIG+=disable-desktop', d)}"
43
44PACKAGES += "${PN}-dictionaries"
45RRECOMMENDS_${PN} += "${PN}-dictionaries"
46FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat"
47FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
48
9DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns" 49DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
10 50
11SRCREV = "626e78c9660cff063e1f9370538b5a424631571c" 51SRCREV = "626e78c9660cff063e1f9370538b5a424631571c"