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/qtwebview | |
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/qtwebview')
-rw-r--r-- | recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch new file mode 100644 index 00000000..82087b9a --- /dev/null +++ b/recipes-qt/qt5/qtwebview/0001-Add-missing-include-for-qWarning.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | From b946b6ea4a2a30bd12ecd036e40c9ef671681ba8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Samuli Piippo <samuli.piippo@qt.io> | ||
3 | Date: Fri, 2 Jun 2017 13:12:18 +0300 | ||
4 | Subject: [PATCH] Add missing include for qWarning | ||
5 | |||
6 | Change-Id: I7c7699e7a2b7ce59e4f659d460ec835f59bba439 | ||
7 | --- | ||
8 | src/webview/qquickwebview.cpp | 1 + | ||
9 | 1 file changed, 1 insertion(+) | ||
10 | |||
11 | diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp | ||
12 | index d760564..fbbbfd6 100644 | ||
13 | --- a/src/webview/qquickwebview.cpp | ||
14 | +++ b/src/webview/qquickwebview.cpp | ||
15 | @@ -39,6 +39,7 @@ | ||
16 | #include <QtWebView/private/qwebviewloadrequest_p.h> | ||
17 | #include <QtQml/qqmlengine.h> | ||
18 | #include <QtCore/qmutex.h> | ||
19 | +#include <QtCore/QDebug> | ||
20 | |||
21 | namespace { | ||
22 | |||