Merge lp:~mitya57/qtubuntu/qt5.9 into lp:qtubuntu

Proposed by Dmitry Shachnev on 2017-07-07
Status: Merged
Approved by: Gianfranco Costamagna on 2017-08-05
Approved revision: 394
Merged at revision: 394
Proposed branch: lp:~mitya57/qtubuntu/qt5.9
Merge into: lp:qtubuntu
Diff against target: 152 lines (+20/-17)
10 files modified
src/shared/ubuntutheme.h (+1/-1)
src/ubuntuappmenu/ubuntuappmenu.pro (+1/-1)
src/ubuntumirclient/qmirclientbackingstore.cpp (+1/-1)
src/ubuntumirclient/qmirclientglcontext.cpp (+2/-2)
src/ubuntumirclient/qmirclientglcontext.h (+1/-1)
src/ubuntumirclient/qmirclientintegration.cpp (+5/-5)
src/ubuntumirclient/qmirclientplatformservices.h (+2/-2)
src/ubuntumirclient/qmirclientscreen.cpp (+1/-1)
src/ubuntumirclient/qmirclientwindow.cpp (+1/-1)
src/ubuntumirclient/ubuntumirclient.pro (+5/-2)
To merge this branch: bzr merge lp:~mitya57/qtubuntu/qt5.9
Reviewer Review Type Date Requested Status
Gerry Boland (community) code 2017-07-07 Approve on 2017-07-07
Unity8 CI Bot continuous-integration Needs Fixing on 2017-07-07
Review via email: mp+326988@code.launchpad.net

Commit message

Fix build with Qt 5.9 and new MIR.

Description of the change

Fix building with new Qt and new MIR.

The new Qt is being prepared in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/2819/+packages, I will add this MP to my Bileto ticket and land it together with Qt 5.9.

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-03-29 14:16:47 +0000
3+++ src/shared/ubuntutheme.h 2017-07-07 08:20:52 +0000
4@@ -15,7 +15,7 @@
5 */
6
7 #include <QVariant>
8-#include <QtPlatformSupport/private/qgenericunixthemes_p.h>
9+#include <QtThemeSupport/private/qgenericunixthemes_p.h>
10
11 class UbuntuTheme : public QGenericUnixTheme
12 {
13
14=== modified file 'src/ubuntuappmenu/ubuntuappmenu.pro'
15--- src/ubuntuappmenu/ubuntuappmenu.pro 2017-03-29 13:39:50 +0000
16+++ src/ubuntuappmenu/ubuntuappmenu.pro 2017-07-07 08:20:52 +0000
17@@ -2,7 +2,7 @@
18 TEMPLATE = lib
19
20 QT -= gui
21-QT += core-private platformsupport-private dbus
22+QT += core-private theme_support-private dbus
23
24 CONFIG += plugin no_keywords
25
26
27=== modified file 'src/ubuntumirclient/qmirclientbackingstore.cpp'
28--- src/ubuntumirclient/qmirclientbackingstore.cpp 2017-03-24 15:26:49 +0000
29+++ src/ubuntumirclient/qmirclientbackingstore.cpp 2017-07-07 08:20:52 +0000
30@@ -44,7 +44,7 @@
31 #include <QtGui/QOpenGLContext>
32 #include <QtGui/QOpenGLTexture>
33 #include <QtGui/QMatrix4x4>
34-#include <QtGui/private/qopengltextureblitter_p.h>
35+#include <QtGui/qopengltextureblitter.h>
36 #include <QtGui/qopenglfunctions.h>
37
38 QMirClientBackingStore::QMirClientBackingStore(QWindow* window)
39
40=== modified file 'src/ubuntumirclient/qmirclientglcontext.cpp'
41--- src/ubuntumirclient/qmirclientglcontext.cpp 2017-02-07 15:37:20 +0000
42+++ src/ubuntumirclient/qmirclientglcontext.cpp 2017-07-07 08:20:52 +0000
43@@ -43,8 +43,8 @@
44 #include "qmirclientwindow.h"
45
46 #include <QOpenGLFramebufferObject>
47-#include <QtPlatformSupport/private/qeglconvenience_p.h>
48-#include <QtPlatformSupport/private/qeglpbuffer_p.h>
49+#include <QtEglSupport/private/qeglconvenience_p.h>
50+#include <QtEglSupport/private/qeglpbuffer_p.h>
51 #include <QtGui/private/qopenglcontext_p.h>
52
53 Q_LOGGING_CATEGORY(mirclientGraphics, "qt.qpa.mirclient.graphics", QtWarningMsg)
54
55=== modified file 'src/ubuntumirclient/qmirclientglcontext.h'
56--- src/ubuntumirclient/qmirclientglcontext.h 2017-02-07 15:37:20 +0000
57+++ src/ubuntumirclient/qmirclientglcontext.h 2017-07-07 08:20:52 +0000
58@@ -42,7 +42,7 @@
59 #define QMIRCLIENTGLCONTEXT_H
60
61 #include <qpa/qplatformopenglcontext.h>
62-#include <QtPlatformSupport/private/qeglplatformcontext_p.h>
63+#include <QtEglSupport/private/qeglplatformcontext_p.h>
64
65 #include <EGL/egl.h>
66
67
68=== modified file 'src/ubuntumirclient/qmirclientintegration.cpp'
69--- src/ubuntumirclient/qmirclientintegration.cpp 2017-04-04 00:46:48 +0000
70+++ src/ubuntumirclient/qmirclientintegration.cpp 2017-07-07 08:20:52 +0000
71@@ -58,11 +58,11 @@
72 #include <qpa/qplatformnativeinterface.h>
73 #include <qpa/qplatforminputcontextfactory_p.h>
74 #include <qpa/qplatforminputcontext.h>
75-#include <QtPlatformSupport/private/qeglconvenience_p.h>
76-#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
77-#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
78-#include <QtPlatformSupport/private/qeglpbuffer_p.h>
79-#include <QtPlatformSupport/private/bridge_p.h>
80+#include <QtEglSupport/private/qeglconvenience_p.h>
81+#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
82+#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
83+#include <QtEglSupport/private/qeglpbuffer_p.h>
84+#include <QtLinuxAccessibilitySupport/private/bridge_p.h>
85 #include <QOpenGLContext>
86 #include <QOffscreenSurface>
87
88
89=== modified file 'src/ubuntumirclient/qmirclientplatformservices.h'
90--- src/ubuntumirclient/qmirclientplatformservices.h 2017-02-07 15:37:20 +0000
91+++ src/ubuntumirclient/qmirclientplatformservices.h 2017-07-07 08:20:52 +0000
92@@ -42,8 +42,8 @@
93 #define QMIRCLIENTPLATFORMSERVICES_H
94
95 #include <qpa/qplatformservices.h>
96-#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
97-#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
98+#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
99+#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
100
101 class QMirClientPlatformServices : public QPlatformServices {
102 public:
103
104=== modified file 'src/ubuntumirclient/qmirclientscreen.cpp'
105--- src/ubuntumirclient/qmirclientscreen.cpp 2017-03-28 12:14:28 +0000
106+++ src/ubuntumirclient/qmirclientscreen.cpp 2017-07-07 08:20:52 +0000
107@@ -52,7 +52,7 @@
108 #include <QScreen>
109 #include <QThread>
110 #include <qpa/qwindowsysteminterface.h>
111-#include <QtPlatformSupport/private/qeglconvenience_p.h>
112+#include <QtEglSupport/private/qeglconvenience_p.h>
113
114 #include <memory>
115
116
117=== modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
118--- src/ubuntumirclient/qmirclientwindow.cpp 2017-03-28 17:12:13 +0000
119+++ src/ubuntumirclient/qmirclientwindow.cpp 2017-07-07 08:20:52 +0000
120@@ -56,7 +56,7 @@
121 #include <QSize>
122 #include <QtMath>
123 #include <QtGui/private/qguiapplication_p.h>
124-#include <QtPlatformSupport/private/qeglconvenience_p.h>
125+#include <QtEglSupport/private/qeglconvenience_p.h>
126
127 #include <EGL/egl.h>
128
129
130=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
131--- src/ubuntumirclient/ubuntumirclient.pro 2017-03-29 13:39:50 +0000
132+++ src/ubuntumirclient/ubuntumirclient.pro 2017-07-07 08:20:52 +0000
133@@ -1,14 +1,17 @@
134 TARGET = qpa-ubuntumirclient
135 TEMPLATE = lib
136
137-QT -= gui
138-QT += core-private platformsupport-private dbus
139+QT += \
140+ core-private dbus linuxaccessibility_support-private \
141+ theme_support-private eventdispatcher_support-private \
142+ fontdatabase_support-private egl_support-private
143
144 CONFIG += plugin no_keywords qpa/genericunixfontdatabase
145
146 DEFINES += MESA_EGL_NO_X11_HEADERS
147 # CONFIG += c++11 # only enables C++0x
148 QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall
149+QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations
150 QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined
151
152 CONFIG += link_pkgconfig

Subscribers

People subscribed via source and target branches