diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-06-09 09:34:09 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-20 19:30:05 +0200 |
commit | 969f1f80bf255498abbec6886d443670c20a79c8 (patch) | |
tree | 45a65f19da61868c2fe71669fb4b7d29b374edac /recipes-qt/qt5/qt5.inc | |
parent | 648f7b0a2eb202d4378ce50ae566b6ca450dd010 (diff) | |
download | meta-qt5-969f1f80bf255498abbec6886d443670c20a79c8.tar.gz |
Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects and QtWebView as a new Qt modules
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not
be applied anymore and support must be done differently
* QtWebEngine now requires gcc-multilib to be installed on the host
system, because the host tools are built to the same bitness as
the target (arm -> x86, aarch64 -> x86-64)
* refresh the patches to match with b5.9* branches on:
https://github.com/meta-qt5/qtbase
https://github.com/meta-qt5/qtwebengine
and 56-based branch on
https://github.com/meta-qt5/qtwebengine-chromium
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt5.inc')
-rw-r--r-- | recipes-qt/qt5/qt5.inc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index 90d7896f..4b5fe8a8 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc | |||
@@ -97,34 +97,42 @@ FILES_${PN}-qmldesigner += " \ | |||
97 | ${OE_QMAKE_PATH_QML}/*/*/*/designer \ | 97 | ${OE_QMAKE_PATH_QML}/*/*/*/designer \ |
98 | " | 98 | " |
99 | 99 | ||
100 | # qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js} | 100 | # qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*.qmlc,*.js,*.jsc} |
101 | FILES_${PN}-qmlplugins = " \ | 101 | FILES_${PN}-qmlplugins = " \ |
102 | ${OE_QMAKE_PATH_QML}/*.qmltypes \ | 102 | ${OE_QMAKE_PATH_QML}/*.qmltypes \ |
103 | ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ | 103 | ${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \ |
104 | ${OE_QMAKE_PATH_QML}/*/qmldir \ | 104 | ${OE_QMAKE_PATH_QML}/*/qmldir \ |
105 | ${OE_QMAKE_PATH_QML}/*/*.qmltypes \ | 105 | ${OE_QMAKE_PATH_QML}/*/*.qmltypes \ |
106 | ${OE_QMAKE_PATH_QML}/*/*.qml \ | 106 | ${OE_QMAKE_PATH_QML}/*/*.qml \ |
107 | ${OE_QMAKE_PATH_QML}/*/*.qmlc \ | ||
107 | ${OE_QMAKE_PATH_QML}/*/*.js \ | 108 | ${OE_QMAKE_PATH_QML}/*/*.js \ |
109 | ${OE_QMAKE_PATH_QML}/*/*.jsc \ | ||
108 | ${OE_QMAKE_PATH_QML}/*/*.png \ | 110 | ${OE_QMAKE_PATH_QML}/*/*.png \ |
109 | ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \ | 111 | ${OE_QMAKE_PATH_QML}/*/*/*${SOLIBSDEV} \ |
110 | ${OE_QMAKE_PATH_QML}/*/*/qmldir \ | 112 | ${OE_QMAKE_PATH_QML}/*/*/qmldir \ |
111 | ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \ | 113 | ${OE_QMAKE_PATH_QML}/*/*/*.qmltypes \ |
112 | ${OE_QMAKE_PATH_QML}/*/*/*.qml \ | 114 | ${OE_QMAKE_PATH_QML}/*/*/*.qml \ |
115 | ${OE_QMAKE_PATH_QML}/*/*/*.qmlc \ | ||
113 | ${OE_QMAKE_PATH_QML}/*/*/*.js \ | 116 | ${OE_QMAKE_PATH_QML}/*/*/*.js \ |
117 | ${OE_QMAKE_PATH_QML}/*/*/*.jsc \ | ||
114 | ${OE_QMAKE_PATH_QML}/*/*/*.png \ | 118 | ${OE_QMAKE_PATH_QML}/*/*/*.png \ |
115 | ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \ | 119 | ${OE_QMAKE_PATH_QML}/*/*/*/*${SOLIBSDEV} \ |
116 | ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \ | 120 | ${OE_QMAKE_PATH_QML}/*/*/*/qmldir \ |
117 | ${OE_QMAKE_PATH_QML}/*/*/*/images \ | 121 | ${OE_QMAKE_PATH_QML}/*/*/*/images \ |
118 | ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \ | 122 | ${OE_QMAKE_PATH_QML}/*/*/*/*.qmltypes \ |
119 | ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ | 123 | ${OE_QMAKE_PATH_QML}/*/*/*/*.qml \ |
124 | ${OE_QMAKE_PATH_QML}/*/*/*/*.qmlc \ | ||
120 | ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ | 125 | ${OE_QMAKE_PATH_QML}/*/*/*/*.js \ |
126 | ${OE_QMAKE_PATH_QML}/*/*/*/*.jsc \ | ||
121 | ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ | 127 | ${OE_QMAKE_PATH_QML}/*/*/*/*.png \ |
122 | ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \ | 128 | ${OE_QMAKE_PATH_QML}/*/*/*/*.metainfo \ |
123 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \ | 129 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*${SOLIBSDEV} \ |
124 | ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \ | 130 | ${OE_QMAKE_PATH_QML}/*/*/*/*/qmldir \ |
125 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \ | 131 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmltypes \ |
126 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \ | 132 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qml \ |
133 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.qmlc \ | ||
127 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \ | 134 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.js \ |
135 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*.jsc \ | ||
128 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \ | 136 | ${OE_QMAKE_PATH_QML}/*/*/*/*/*/*.png \ |
129 | ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \ | 137 | ${OE_QMAKE_PATH_IMPORTS}/*.qmltypes \ |
130 | ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \ | 138 | ${OE_QMAKE_PATH_IMPORTS}/*/*${SOLIBSDEV} \ |