summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2018-10-11 15:32:55 +0300
committerMikko Gronoff <mikko.gronoff@qt.io>2018-10-14 16:19:16 +0300
commita6d84200c76439308699246d62bb6a6809cce1d5 (patch)
treea41f9c76009d0cf571f5b978607d29749fa4e62e /recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch
parent8e485a2bfa4632bfefea861c2a06d9a6e8fc5c33 (diff)
parent0c7eb257c3b0f03592e407e13c635d9e523fbcd0 (diff)
downloadmeta-qt5-a6d84200c76439308699246d62bb6a6809cce1d5.tar.gz
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master: 0c7eb25 layer.conf: Add thud to LAYERSERIES_COMPAT 4e6c472 qt5-creator: Check before editing translation Makefile 15a8c25 qt5-creator: Pick native tools from native sysroot e.g. lrelease etc. f11e942 qt5-creator: fix build with QMAKE_AR 0cf5966 qt5-creator: upgrade to 4.7.1+ 4fb1e60 qt: package all files in ${PN}-examples 2109ff6 qt: use single -dev and -staticdev package 5c5b7e8 qt5-creator: refresh .patch files and push them to meta-qt5 fork 333437c qt5-creator: Fix build due to missing lrelease 3ad2acb qtchooser: Update to latest git 1ed9bcb qtwebengine: Add patches to fix breakpad in new webengine release on musl 24d6fc2 qtbase: Do not use cross_compile check d0cd7a7 qtbase: Fix errors due to -isystem 8123922 qtbase: Fix build error for armv8BE multilib. f9e80ed qt5: update to latest revision in 5.11 branch 3e7da25 qt5: update to Qt 5.11.2 cd0da4e libqofono: include /qt5/mkspecs in ${PN}-dev db45ea6 qtwebkit-examples: Fix build with QT 5.11 d498eb6 qtwebkit: Use relative paths for pri files when cross compile b716195 qmake5_paths: change the default QT_DIR_NAME to be empty 3224b02 nativesdk-qtbase: use default PACKAGES 66c49f8 qt5-creator: strip few more useless rpaths 03b4c7b qt: remove unnecessary FILES.*-dbg variables for packaging .debug files 5164f84 qt3d-runtime: Fix compile errors as seen with mips/musl 08aaba0 qt3d-runtime: upgrade to latest revision in 2.0 branch a8832a7 qtwebkit: Make qtwebkit support arm32 BE. 215e81d qtscript: add patches to meta-qt5 fork 66a9704 qtscript: Fix build on musl edf1e43 qtwebkit: add patches to meta-qt5 fork a307eb0 qtwebkit: Fix conflicts with -I and -isystem 3e4141c qtwebkit: Fix build with musl c977d68 qt5-creator: Strip out redundant RPATH 189dd8a qt5-creator: Fix building botan for all non-x86 arches 85e665b qtwebengine: use nasm-native instead of yasm-native 75bc440 qtbase: fix install locations used in static builds 823fa38 qtwebengine: enable debug info for webengine Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtcharts_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdatavis3d_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtgamepad_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtknx_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmqtt_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtnetworkauth_git.bb recipes-qt/qt5/qtopcua_git.bb recipes-qt/qt5/qtpurchasing_git.bb recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtremoteobjects_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtscxml_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialbus_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qtvirtualkeyboard_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebglplugin_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtwebview_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I7542ddc6eee1ae7e444f24fd1d502291af40afee
Diffstat (limited to 'recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch')
-rw-r--r--recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch b/recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch
new file mode 100644
index 00000000..57e318b0
--- /dev/null
+++ b/recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch
@@ -0,0 +1,48 @@
1From e07f1fcba5a291ef0ab31fd85fbc4836eda19a66 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 24 Sep 2018 03:14:29 -0700
4Subject: [PATCH] Fix build with qt 5.11
5
6Fixes
7
8examples/webkitwidgets/scroller/wheel/main.cpp:93:84: error: cannot call
9member function 'int QRandomGenerator::bounded(int)' without object
10 m_wheel1->scrollTo(m_wheel1->currentIndex() +
11QRandomGenerator::bounded(200));
12
13Upstream-Status: Pending
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 examples/webkitwidgets/scroller/wheel/main.cpp | 8 ++++----
18 1 file changed, 4 insertions(+), 4 deletions(-)
19
20diff --git a/examples/webkitwidgets/scroller/wheel/main.cpp b/examples/webkitwidgets/scroller/wheel/main.cpp
21index 11fad08..9a6a225 100644
22--- a/examples/webkitwidgets/scroller/wheel/main.cpp
23+++ b/examples/webkitwidgets/scroller/wheel/main.cpp
24@@ -40,7 +40,7 @@
25
26 #include <QtWidgets>
27 #include <qmath.h>
28-
29+#include <QRandomGenerator>
30 #include "wheelwidget.h"
31
32 class MainWindow : public QMainWindow
33@@ -90,9 +90,9 @@ public:
34 private slots:
35 void rotateRandom()
36 {
37- m_wheel1->scrollTo(m_wheel1->currentIndex() + QRandomGenerator::bounded(200));
38- m_wheel2->scrollTo(m_wheel2->currentIndex() + QRandomGenerator::bounded(200));
39- m_wheel3->scrollTo(m_wheel3->currentIndex() + QRandomGenerator::bounded(200));
40+ m_wheel1->scrollTo(m_wheel1->currentIndex() + QRandomGenerator::global()->bounded(200));
41+ m_wheel2->scrollTo(m_wheel2->currentIndex() + QRandomGenerator::global()->bounded(200));
42+ m_wheel3->scrollTo(m_wheel3->currentIndex() + QRandomGenerator::global()->bounded(200));
43 }
44
45 private:
46--
472.19.0
48