qtubuntu

Merge lp:~gerboland/qtubuntu/xenial-artful-build into lp:qtubuntu

  1. xenial-artful-build
  2. Merge into trunk
Proposed by Gerry Boland
Status: Approved
Approved by: Michał Sawicz
Approved revision: 402
Proposed branch: lp:~gerboland/qtubuntu/xenial-artful-build
Merge into: lp:qtubuntu
Prerequisite: lp:~saviq/qtubuntu/remove-content-hub-and-ual-gles
Diff against target: 192 lines (+61/-25)
8 files modified
src/shared/ubuntutheme.h (+5/-1)
src/ubuntumirclient/qmirclientbackingstore.cpp (+5/-1)
src/ubuntumirclient/qmirclientglcontext.cpp (+7/-2)
src/ubuntumirclient/qmirclientglcontext.h (+5/-1)
src/ubuntumirclient/qmirclientintegration.cpp (+21/-13)
src/ubuntumirclient/qmirclientscreen.cpp (+5/-1)
src/ubuntumirclient/qmirclientwindow.cpp (+5/-2)
src/ubuntumirclient/ubuntumirclient.pro (+8/-4)
To merge this branch: bzr merge lp:~gerboland/qtubuntu/xenial-artful-build
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+332112@code.launchpad.net

This proposal supersedes a proposal from 2017-10-11.

Commit message

Support building on Qt5.7 and 5.9 (xenial and artful)

To post a comment you must log in.
lp:~gerboland/qtubuntu/xenial-artful-build updated
402. By Gerry Boland

Comparing with 5.8 is clearer

Unmerged revisions

402. By Gerry Boland

Comparing with 5.8 is clearer

401. By Gerry Boland

Support building on Qt5.7 and Qt5.9

400. By Michał Sawicz

Update convert-to-gles.patch

399. By Gerry Boland

Merge trunk and fix conflicts

398. By Gerry Boland

Remove another ref to papi

397. By Gerry Boland

Reduce delta

396. By Gerry Boland

Restore basic platform services

395. By Gerry Boland

Remove clipboard implementation using content-hub

394. By Gerry Boland

Merge papi-cleanup and fix

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/shared/ubuntutheme.h'
2--- src/shared/ubuntutheme.h 2017-07-07 08:17:58 +0000
3+++ src/shared/ubuntutheme.h 2017-10-11 14:29:52 +0000
4@@ -15,7 +15,11 @@
5 */
6
7 #include <QVariant>
8-#include <QtThemeSupport/private/qgenericunixthemes_p.h>
9+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
10+# include <QtThemeSupport/private/qgenericunixthemes_p.h>
11+#else
12+# include <QtPlatformSupport/private/qgenericunixthemes_p.h>
13+#endif
14
15 class UbuntuTheme : public QGenericUnixTheme
16 {
17
18=== modified file 'src/ubuntumirclient/qmirclientbackingstore.cpp'
19--- src/ubuntumirclient/qmirclientbackingstore.cpp 2017-07-07 08:17:58 +0000
20+++ src/ubuntumirclient/qmirclientbackingstore.cpp 2017-10-11 14:29:52 +0000
21@@ -44,8 +44,12 @@
22 #include <QtGui/QOpenGLContext>
23 #include <QtGui/QOpenGLTexture>
24 #include <QtGui/QMatrix4x4>
25-#include <QtGui/qopengltextureblitter.h>
26 #include <QtGui/qopenglfunctions.h>
27+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
28+# include <QtGui/qopengltextureblitter.h>
29+#else
30+# include <QtGui/private/qopengltextureblitter_p.h>
31+#endif
32
33 QMirClientBackingStore::QMirClientBackingStore(QWindow* window)
34 : QPlatformBackingStore(window)
35
36=== modified file 'src/ubuntumirclient/qmirclientglcontext.cpp'
37--- src/ubuntumirclient/qmirclientglcontext.cpp 2017-07-07 08:17:58 +0000
38+++ src/ubuntumirclient/qmirclientglcontext.cpp 2017-10-11 14:29:52 +0000
39@@ -43,9 +43,14 @@
40 #include "qmirclientwindow.h"
41
42 #include <QOpenGLFramebufferObject>
43-#include <QtEglSupport/private/qeglconvenience_p.h>
44-#include <QtEglSupport/private/qeglpbuffer_p.h>
45 #include <QtGui/private/qopenglcontext_p.h>
46+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
47+# include <QtEglSupport/private/qeglconvenience_p.h>
48+# include <QtEglSupport/private/qeglpbuffer_p.h>
49+#else
50+# include <QtPlatformSupport/private/qeglconvenience_p.h>
51+# include <QtPlatformSupport/private/qeglpbuffer_p.h>
52+#endif
53
54 Q_LOGGING_CATEGORY(mirclientGraphics, "qt.qpa.mirclient.graphics", QtWarningMsg)
55
56
57=== modified file 'src/ubuntumirclient/qmirclientglcontext.h'
58--- src/ubuntumirclient/qmirclientglcontext.h 2017-07-07 08:17:58 +0000
59+++ src/ubuntumirclient/qmirclientglcontext.h 2017-10-11 14:29:52 +0000
60@@ -42,7 +42,11 @@
61 #define QMIRCLIENTGLCONTEXT_H
62
63 #include <qpa/qplatformopenglcontext.h>
64-#include <QtEglSupport/private/qeglplatformcontext_p.h>
65+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
66+# include <QtEglSupport/private/qeglplatformcontext_p.h>
67+#else
68+# include <QtPlatformSupport/private/qeglplatformcontext_p.h>
69+#endif
70
71 #include <EGL/egl.h>
72
73
74=== modified file 'src/ubuntumirclient/qmirclientintegration.cpp'
75--- src/ubuntumirclient/qmirclientintegration.cpp 2017-10-11 14:29:52 +0000
76+++ src/ubuntumirclient/qmirclientintegration.cpp 2017-10-11 14:29:52 +0000
77@@ -54,17 +54,29 @@
78 // Qt
79 #include <QFileInfo>
80 #include <QGuiApplication>
81+#include <QOpenGLContext>
82+#include <QOffscreenSurface>
83 #include <qpa/qplatformnativeinterface.h>
84 #include <qpa/qplatforminputcontextfactory_p.h>
85 #include <qpa/qplatforminputcontext.h>
86-#include <QtEglSupport/private/qeglconvenience_p.h>
87-#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
88-#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
89-#include <QtServiceSupport/private/qgenericunixservices_p.h>
90-#include <QtEglSupport/private/qeglpbuffer_p.h>
91-#include <QtLinuxAccessibilitySupport/private/bridge_p.h>
92-#include <QOpenGLContext>
93-#include <QOffscreenSurface>
94+
95+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
96+# include <QtEglSupport/private/qeglconvenience_p.h>
97+# include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
98+# include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
99+# include <QtServiceSupport/private/qgenericunixservices_p.h>
100+# include <QtEglSupport/private/qeglpbuffer_p.h>
101+# include <QtLinuxAccessibilitySupport/private/bridge_p.h>
102+#else
103+# include <QtPlatformSupport/private/qeglconvenience_p.h>
104+# include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
105+# include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
106+# include <QtPlatformSupport/private/qgenericunixservices_p.h>
107+# include <QtPlatformSupport/private/qeglpbuffer_p.h>
108+# include <QtPlatformSupport/private/bridge_p.h>
109+#endif
110+
111+
112
113 namespace
114 {
115@@ -244,7 +256,7 @@
116 case ApplicationState:
117 case MultipleWindows:
118 case NonFullScreenWindows:
119-#if QT_VERSION > QT_VERSION_CHECK(5, 5, 0)
120+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
121 case SwitchableWidgetComposition:
122 #endif
123 case RasterGLSurface: // needed for QQuickWidget
124@@ -351,11 +363,7 @@
125 }
126
127 qCDebug(mirclient) << "Removing Screen with id" << screen->mirOutputId() << "and geometry" << screen->geometry();
128-#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0)
129- delete screen;
130-#else
131 QPlatformIntegration::destroyScreen(screen);
132-#endif
133 }
134
135 QPlatformAccessibility *QMirClientClientIntegration::accessibility() const
136
137=== modified file 'src/ubuntumirclient/qmirclientscreen.cpp'
138--- src/ubuntumirclient/qmirclientscreen.cpp 2017-07-07 08:17:58 +0000
139+++ src/ubuntumirclient/qmirclientscreen.cpp 2017-10-11 14:29:52 +0000
140@@ -52,7 +52,11 @@
141 #include <QScreen>
142 #include <QThread>
143 #include <qpa/qwindowsysteminterface.h>
144-#include <QtEglSupport/private/qeglconvenience_p.h>
145+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
146+# include <QtEglSupport/private/qeglconvenience_p.h>
147+#else
148+# include <QtPlatformSupport/private/qeglconvenience_p.h>
149+#endif
150
151 #include <memory>
152
153
154=== modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
155--- src/ubuntumirclient/qmirclientwindow.cpp 2017-10-11 14:29:52 +0000
156+++ src/ubuntumirclient/qmirclientwindow.cpp 2017-10-11 14:29:52 +0000
157@@ -56,8 +56,11 @@
158 #include <QSize>
159 #include <QtMath>
160 #include <QtGui/private/qguiapplication_p.h>
161-#include <QtEglSupport/private/qeglconvenience_p.h>
162-
163+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
164+# include <QtEglSupport/private/qeglconvenience_p.h>
165+#else
166+# include <QtPlatformSupport/private/qeglconvenience_p.h>
167+#endif
168 #include <EGL/egl.h>
169
170 Q_LOGGING_CATEGORY(mirclientBufferSwap, "qt.qpa.mirclient.bufferSwap", QtWarningMsg)
171
172=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
173--- src/ubuntumirclient/ubuntumirclient.pro 2017-10-11 14:29:52 +0000
174+++ src/ubuntumirclient/ubuntumirclient.pro 2017-10-11 14:29:52 +0000
175@@ -1,10 +1,14 @@
176 TARGET = qpa-ubuntumirclient
177 TEMPLATE = lib
178
179-QT += \
180- core-private dbus linuxaccessibility_support-private \
181- theme_support-private eventdispatcher_support-private \
182- fontdatabase_support-private egl_support-private service_support-private
183+greaterThan(QT_MINOR_VERSION, 7) {
184+ QT += \
185+ core-private linuxaccessibility_support-private \
186+ theme_support-private eventdispatcher_support-private \
187+ fontdatabase_support-private egl_support-private service_support-private
188+} else {
189+ QT += core-private platformsupport-private
190+}
191
192 CONFIG += plugin no_keywords qpa/genericunixfontdatabase
193

Subscribers

People subscribed via source and target branches