diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-23 08:02:55 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-12-23 19:40:35 +0000 |
commit | 7cc177d116ad98d0c922f98aa7f02c2cc655c0ec (patch) | |
tree | 74648680f212b80885716af4cbfa851b97974cd4 /recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch | |
parent | 1b755b2e05a95a8c1d74f131d211b814109e3a32 (diff) | |
download | meta-qt5-7cc177d116ad98d0c922f98aa7f02c2cc655c0ec.tar.gz |
qtwebkit-examples: drop recipe
* it's not supported by upstream
* it's broken again with 5.12.0:
http://errors.yoctoproject.org/Errors/Build/74151/
make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/simpleselector'
make[3]: *** No rule to make target 'QtWebKit/QWebView', needed by '.uic/ui_window.h'. Stop.
make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/simpleselector'
...
make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/domtraversal'
make[3]: *** No rule to make target 'QtWebKitWidgets/QWebView', needed by '.uic/ui_window.h'. Stop.
make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/domtraversal'
...
make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/formextractor'
make[3]: *** No rule to make target 'QtWebKit/QWebView', needed by '.uic/ui_formextractor.h'. Stop.
make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/formextractor'
...
make[3]: Entering directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/previewer'
make[3]: *** No rule to make target 'QtWebKit/QWebView', needed by '.uic/ui_previewer.h'. Stop.
make[3]: Leaving directory 'TOPDIR/tmp-glibc/work/core2-64-oe-linux/qtwebkit-examples/5.12.0+gitAUTOINC+2d68492004-r0/build/examples/webkitwidgets/previewer'
* nobody was interested in fixing it last time it got broken with 5.11
upgrade:
https://patchwork.openembedded.org/patch/151399/
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
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.patch | 48 |
1 files changed, 0 insertions, 48 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 deleted file mode 100644 index 57e318b0..00000000 --- a/recipes-qt/qt5/qtwebkit-examples/0001-Fix-build-with-qt-5.11.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From e07f1fcba5a291ef0ab31fd85fbc4836eda19a66 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 24 Sep 2018 03:14:29 -0700 | ||
4 | Subject: [PATCH] Fix build with qt 5.11 | ||
5 | |||
6 | Fixes | ||
7 | |||
8 | examples/webkitwidgets/scroller/wheel/main.cpp:93:84: error: cannot call | ||
9 | member function 'int QRandomGenerator::bounded(int)' without object | ||
10 | m_wheel1->scrollTo(m_wheel1->currentIndex() + | ||
11 | QRandomGenerator::bounded(200)); | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-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 | |||
20 | diff --git a/examples/webkitwidgets/scroller/wheel/main.cpp b/examples/webkitwidgets/scroller/wheel/main.cpp | ||
21 | index 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 | -- | ||
47 | 2.19.0 | ||
48 | |||