summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtwayland
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-01-26 16:54:50 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-01-26 16:18:39 +0100
commit333949a8239dfa7788b35f1059614733e11a6a25 (patch)
tree420843abad8bfc939484fa34bd6f7da9d432db8d /recipes-qt/qt5/qtwayland
parentc0ba8ab590ba4e17a2a04925cf48915233d4f493 (diff)
downloadmeta-qt5-333949a8239dfa7788b35f1059614733e11a6a25.tar.gz
Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. The new Qt configuration system [1] can be used with a new variable EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature arguments. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. Recipes for new Qt modules: QtSCXML, QtNetworkAuth, QtGamepad. Removes qtdeclarative-render2d [1] https://www.mail-archive.com/development@qt-project.org/msg25257.html Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213 Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwayland')
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch156
-rw-r--r--recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch29
-rw-r--r--recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch27
3 files changed, 0 insertions, 212 deletions
diff --git a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch b/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
deleted file mode 100644
index d173e673..00000000
--- a/recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch
+++ /dev/null
@@ -1,156 +0,0 @@
1From de85e1c1ee76be845a21b441d9e4ea12a30d84c7 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= <dachaac@gmail.com>
3Date: Sun, 18 Sep 2016 11:51:59 +0300
4Subject: [PATCH] Fix building of QWaylandIntegration if some Qt5 features are
5 disabled.
6
7QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL,
8QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and
9QT_NO_SESSIONMANAGER, these has to be taken into account when compiling
10QtWayland.
11---
12 src/client/qwaylandintegration.cpp | 21 ++++++++++++++++++---
13 src/client/qwaylandintegration_p.h | 12 ++++++++++++
14 2 files changed, 30 insertions(+), 3 deletions(-)
15
16diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
17index 39fff53..481e3d6 100644
18--- a/src/client/qwaylandintegration.cpp
19+++ b/src/client/qwaylandintegration.cpp
20@@ -39,7 +39,9 @@
21 #include "qwaylandinputcontext_p.h"
22 #include "qwaylandshmbackingstore_p.h"
23 #include "qwaylandnativeinterface_p.h"
24+#ifndef QT_NO_CLIPBOARD
25 #include "qwaylandclipboard_p.h"
26+#endif
27 #include "qwaylanddnd_p.h"
28 #include "qwaylandwindowmanagerintegration_p.h"
29 #include "qwaylandscreen_p.h"
30@@ -57,7 +59,9 @@
31 #include <QSocketNotifier>
32
33 #include <qpa/qplatforminputcontextfactory_p.h>
34+#ifndef QT_NO_ACCESSIBILITY
35 #include <qpa/qplatformaccessibility.h>
36+#endif
37 #include <qpa/qplatforminputcontext.h>
38
39 #include "qwaylandhardwareintegration_p.h"
40@@ -117,8 +121,6 @@ QWaylandIntegration::QWaylandIntegration()
41 , mNativeInterface(new QWaylandNativeInterface(this))
42 #ifndef QT_NO_ACCESSIBILITY
43 , mAccessibility(new QPlatformAccessibility())
44-#else
45- , mAccessibility(0)
46 #endif
47 , mClientBufferIntegrationInitialized(false)
48 , mServerBufferIntegrationInitialized(false)
49@@ -126,9 +128,12 @@ QWaylandIntegration::QWaylandIntegration()
50 {
51 initializeInputDeviceIntegration();
52 mDisplay = new QWaylandDisplay(this);
53+#ifndef QT_NO_CLIPBOARD
54 mClipboard = new QWaylandClipboard(mDisplay);
55+#endif
56+#ifndef QT_NO_DRAGANDDROP
57 mDrag = new QWaylandDrag(mDisplay);
58-
59+#endif
60 QString icStr = QPlatformInputContextFactory::requested();
61 icStr.isNull() ? mInputContext.reset(new QWaylandInputContext(mDisplay))
62 : mInputContext.reset(QPlatformInputContextFactory::create(icStr));
63@@ -136,8 +141,12 @@ QWaylandIntegration::QWaylandIntegration()
64
65 QWaylandIntegration::~QWaylandIntegration()
66 {
67+#ifndef QT_NO_DRAGANDDROP
68 delete mDrag;
69+#endif
70+#ifndef QT_NO_CLIPBOARD
71 delete mClipboard;
72+#endif
73 #ifndef QT_NO_ACCESSIBILITY
74 delete mAccessibility;
75 #endif
76@@ -213,15 +222,19 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const
77 return mFontDb;
78 }
79
80+#ifndef QT_NO_CLIPBOARD
81 QPlatformClipboard *QWaylandIntegration::clipboard() const
82 {
83 return mClipboard;
84 }
85+#endif
86
87+#ifndef QT_NO_DRAGANDDROP
88 QPlatformDrag *QWaylandIntegration::drag() const
89 {
90 return mDrag;
91 }
92+#endif
93
94 QPlatformInputContext *QWaylandIntegration::inputContext() const
95 {
96@@ -243,10 +256,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const
97 return QPlatformIntegration::styleHint(hint);
98 }
99
100+#ifndef QT_NO_ACCESSIBILITY
101 QPlatformAccessibility *QWaylandIntegration::accessibility() const
102 {
103 return mAccessibility;
104 }
105+#endif
106
107 QPlatformServices *QWaylandIntegration::services() const
108 {
109diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
110index 987d805..b50ad95 100644
111--- a/src/client/qwaylandintegration_p.h
112+++ b/src/client/qwaylandintegration_p.h
113@@ -80,15 +80,21 @@ public:
114
115 QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
116
117+#ifndef QT_NO_CLIPBOARD
118 QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE;
119+#endif
120
121+#ifndef QT_NO_DRAGANDDROP
122 QPlatformDrag *drag() const Q_DECL_OVERRIDE;
123+#endif
124
125 QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE;
126
127 QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
128
129+#ifndef QT_NO_ACCESSIBILITY
130 QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
131+#endif
132
133 QPlatformServices *services() const Q_DECL_OVERRIDE;
134
135@@ -117,12 +123,18 @@ private:
136 void initializeInputDeviceIntegration();
137
138 QPlatformFontDatabase *mFontDb;
139+#ifndef QT_NO_CLIPBOARD
140 QPlatformClipboard *mClipboard;
141+#endif
142+#ifndef QT_NO_DRAGANDDROP
143 QPlatformDrag *mDrag;
144+#endif
145 QWaylandDisplay *mDisplay;
146 QPlatformNativeInterface *mNativeInterface;
147 QScopedPointer<QPlatformInputContext> mInputContext;
148+#ifndef QT_NO_ACCESSIBILITY
149 QPlatformAccessibility *mAccessibility;
150+#endif
151 bool mClientBufferIntegrationInitialized;
152 bool mServerBufferIntegrationInitialized;
153 bool mShellIntegrationInitialized;
154--
1552.7.4
156
diff --git a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch b/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
deleted file mode 100644
index 847ba06f..00000000
--- a/recipes-qt/qt5/qtwayland/0001-Install-the-qtwaylandscanner-tool-to-the-native-side.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 47457635603ddb484a479834a052699cce5b34a3 Mon Sep 17 00:00:00 2001
2From: Simon Busch <morphis@gravedo.de>
3Date: Fri, 19 Jul 2013 13:35:14 +0000
4Subject: [PATCH] Install the qtwaylandscanner tool to the native side
5
6Upstream-Status: Inappropiate [configuration]
7
8Signed-off-by: Simon Busch <morphis@gravedo.de>
9---
10 src/qtwaylandscanner/qtwaylandscanner.pro | 8 ++++++--
11 1 file changed, 6 insertions(+), 2 deletions(-)
12
13diff --git a/src/qtwaylandscanner/qtwaylandscanner.pro b/src/qtwaylandscanner/qtwaylandscanner.pro
14index ac2d07b..7a46a24 100644
15--- a/src/qtwaylandscanner/qtwaylandscanner.pro
16+++ b/src/qtwaylandscanner/qtwaylandscanner.pro
17@@ -1,6 +1,10 @@
18 option(host_build)
19
20-SOURCES += qtwaylandscanner.cpp
21+TARGET = qtwaylandscanner$$qtPlatformTargetSuffix()
22+CONFIG += console warn_off
23+QT = core
24
25-load(qt_tool)
26+SOURCES += qtwaylandscanner.cpp
27
28+target.path = $$[QT_HOST_BINS]
29+INSTALLS += target
diff --git a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch b/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
deleted file mode 100644
index a21c1094..00000000
--- a/recipes-qt/qt5/qtwayland/0001-examples-wayland-include-server-buffer-only-when-bui.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From 733a85c14cb4ade510a0c78b32cd12cb2d70dbbd Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 22 Feb 2014 17:47:44 +0100
4Subject: [PATCH] examples/wayland: include server-buffer only when building
5 with opengles2
6
7* it's using glBindBuffer in
8 server-buffer/client/serverbufferrenderer.cpp
9
10Change-Id: I8412dfd4ebb95c147328ac6e4dfff14a0cff4e78
11Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12---
13 examples/wayland/wayland.pro | 4 +++-
14 1 file changed, 3 insertions(+), 1 deletion(-)
15
16diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro
17index 503190c..9943c52 100644
18--- a/examples/wayland/wayland.pro
19+++ b/examples/wayland/wayland.pro
20@@ -10,4 +10,6 @@ qtHaveModule(quick) {
21 SUBDIRS += custom-extension
22 }
23
24-SUBDIRS += server-buffer
25+contains(QT_CONFIG, opengles2) {
26+ SUBDIRS += server-buffer
27+}