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/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch | |
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/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch')
-rw-r--r-- | recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch b/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch deleted file mode 100644 index d08c57e9..00000000 --- a/recipes-qt/qt5/qtquickcontrols2/0001-qtquickcontrols2-fix-compilation-of-examples-textedi.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 3696a416bd594d3f280c281cb2a66bc837829238 Mon Sep 17 00:00:00 2001 | ||
2 | From: Steffen Sledz <sledz@dresearch-fe.de> | ||
3 | Date: Thu, 6 Jul 2017 13:28:07 +0200 | ||
4 | Subject: [PATCH] qtquickcontrols2: fix compilation of examples/texteditor | ||
5 | |||
6 | git/examples/quickcontrols2/texteditor/documenthandler.cpp:284:18: error: invalid use of incomplete type 'class QDebug' | ||
7 | qWarning() << "load() called before DocumentHandler has QQmlEngine"; | ||
8 | |||
9 | Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> | ||
10 | --- | ||
11 | examples/quickcontrols2/texteditor/documenthandler.cpp | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/examples/quickcontrols2/texteditor/documenthandler.cpp b/examples/quickcontrols2/texteditor/documenthandler.cpp | ||
15 | index e57946fd..94ca82ad 100644 | ||
16 | --- a/examples/quickcontrols2/texteditor/documenthandler.cpp | ||
17 | +++ b/examples/quickcontrols2/texteditor/documenthandler.cpp | ||
18 | @@ -59,6 +59,7 @@ | ||
19 | #include <QTextCharFormat> | ||
20 | #include <QTextCodec> | ||
21 | #include <QTextDocument> | ||
22 | +#include <QtCore/QDebug> | ||
23 | |||
24 | DocumentHandler::DocumentHandler(QObject *parent) | ||
25 | : QObject(parent) | ||
26 | -- | ||
27 | 2.13.2 | ||
28 | |||