qtubuntu

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

  1. qt5.9
  2. Merge into trunk
Proposed by Dmitry Shachnev
Status: Merged
Approved by: Gianfranco Costamagna
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 Approve
Unity8 CI Bot continuous-integration Needs Fixing
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.

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:394
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/226/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4927/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4955
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4762/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4762/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4762/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4762/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4762/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4762/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/226/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) wrote :

Changes look sensible. I'll need to test it though

review: Approve (code)
Revision history for this message
Gianfranco Costamagna (costamagnagianfranco) wrote :

I like them, I would like to see them merged to have 5.9 land

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/shared/ubuntutheme.h'
--- src/shared/ubuntutheme.h 2017-03-29 14:16:47 +0000
+++ src/shared/ubuntutheme.h 2017-07-07 08:20:52 +0000
@@ -15,7 +15,7 @@
15 */15 */
1616
17#include <QVariant>17#include <QVariant>
18#include <QtPlatformSupport/private/qgenericunixthemes_p.h>18#include <QtThemeSupport/private/qgenericunixthemes_p.h>
1919
20class UbuntuTheme : public QGenericUnixTheme20class UbuntuTheme : public QGenericUnixTheme
21{21{
2222
=== modified file 'src/ubuntuappmenu/ubuntuappmenu.pro'
--- src/ubuntuappmenu/ubuntuappmenu.pro 2017-03-29 13:39:50 +0000
+++ src/ubuntuappmenu/ubuntuappmenu.pro 2017-07-07 08:20:52 +0000
@@ -2,7 +2,7 @@
2TEMPLATE = lib2TEMPLATE = lib
33
4QT -= gui4QT -= gui
5QT += core-private platformsupport-private dbus5QT += core-private theme_support-private dbus
66
7CONFIG += plugin no_keywords7CONFIG += plugin no_keywords
88
99
=== modified file 'src/ubuntumirclient/qmirclientbackingstore.cpp'
--- src/ubuntumirclient/qmirclientbackingstore.cpp 2017-03-24 15:26:49 +0000
+++ src/ubuntumirclient/qmirclientbackingstore.cpp 2017-07-07 08:20:52 +0000
@@ -44,7 +44,7 @@
44#include <QtGui/QOpenGLContext>44#include <QtGui/QOpenGLContext>
45#include <QtGui/QOpenGLTexture>45#include <QtGui/QOpenGLTexture>
46#include <QtGui/QMatrix4x4>46#include <QtGui/QMatrix4x4>
47#include <QtGui/private/qopengltextureblitter_p.h>47#include <QtGui/qopengltextureblitter.h>
48#include <QtGui/qopenglfunctions.h>48#include <QtGui/qopenglfunctions.h>
4949
50QMirClientBackingStore::QMirClientBackingStore(QWindow* window)50QMirClientBackingStore::QMirClientBackingStore(QWindow* window)
5151
=== modified file 'src/ubuntumirclient/qmirclientglcontext.cpp'
--- src/ubuntumirclient/qmirclientglcontext.cpp 2017-02-07 15:37:20 +0000
+++ src/ubuntumirclient/qmirclientglcontext.cpp 2017-07-07 08:20:52 +0000
@@ -43,8 +43,8 @@
43#include "qmirclientwindow.h"43#include "qmirclientwindow.h"
4444
45#include <QOpenGLFramebufferObject>45#include <QOpenGLFramebufferObject>
46#include <QtPlatformSupport/private/qeglconvenience_p.h>46#include <QtEglSupport/private/qeglconvenience_p.h>
47#include <QtPlatformSupport/private/qeglpbuffer_p.h>47#include <QtEglSupport/private/qeglpbuffer_p.h>
48#include <QtGui/private/qopenglcontext_p.h>48#include <QtGui/private/qopenglcontext_p.h>
4949
50Q_LOGGING_CATEGORY(mirclientGraphics, "qt.qpa.mirclient.graphics", QtWarningMsg)50Q_LOGGING_CATEGORY(mirclientGraphics, "qt.qpa.mirclient.graphics", QtWarningMsg)
5151
=== modified file 'src/ubuntumirclient/qmirclientglcontext.h'
--- src/ubuntumirclient/qmirclientglcontext.h 2017-02-07 15:37:20 +0000
+++ src/ubuntumirclient/qmirclientglcontext.h 2017-07-07 08:20:52 +0000
@@ -42,7 +42,7 @@
42#define QMIRCLIENTGLCONTEXT_H42#define QMIRCLIENTGLCONTEXT_H
4343
44#include <qpa/qplatformopenglcontext.h>44#include <qpa/qplatformopenglcontext.h>
45#include <QtPlatformSupport/private/qeglplatformcontext_p.h>45#include <QtEglSupport/private/qeglplatformcontext_p.h>
4646
47#include <EGL/egl.h>47#include <EGL/egl.h>
4848
4949
=== modified file 'src/ubuntumirclient/qmirclientintegration.cpp'
--- src/ubuntumirclient/qmirclientintegration.cpp 2017-04-04 00:46:48 +0000
+++ src/ubuntumirclient/qmirclientintegration.cpp 2017-07-07 08:20:52 +0000
@@ -58,11 +58,11 @@
58#include <qpa/qplatformnativeinterface.h>58#include <qpa/qplatformnativeinterface.h>
59#include <qpa/qplatforminputcontextfactory_p.h>59#include <qpa/qplatforminputcontextfactory_p.h>
60#include <qpa/qplatforminputcontext.h>60#include <qpa/qplatforminputcontext.h>
61#include <QtPlatformSupport/private/qeglconvenience_p.h>61#include <QtEglSupport/private/qeglconvenience_p.h>
62#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>62#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
63#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>63#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
64#include <QtPlatformSupport/private/qeglpbuffer_p.h>64#include <QtEglSupport/private/qeglpbuffer_p.h>
65#include <QtPlatformSupport/private/bridge_p.h>65#include <QtLinuxAccessibilitySupport/private/bridge_p.h>
66#include <QOpenGLContext>66#include <QOpenGLContext>
67#include <QOffscreenSurface>67#include <QOffscreenSurface>
6868
6969
=== modified file 'src/ubuntumirclient/qmirclientplatformservices.h'
--- src/ubuntumirclient/qmirclientplatformservices.h 2017-02-07 15:37:20 +0000
+++ src/ubuntumirclient/qmirclientplatformservices.h 2017-07-07 08:20:52 +0000
@@ -42,8 +42,8 @@
42#define QMIRCLIENTPLATFORMSERVICES_H42#define QMIRCLIENTPLATFORMSERVICES_H
4343
44#include <qpa/qplatformservices.h>44#include <qpa/qplatformservices.h>
45#include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>45#include <QtFontDatabaseSupport/private/qgenericunixfontdatabase_p.h>
46#include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>46#include <QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h>
4747
48class QMirClientPlatformServices : public QPlatformServices {48class QMirClientPlatformServices : public QPlatformServices {
49public:49public:
5050
=== modified file 'src/ubuntumirclient/qmirclientscreen.cpp'
--- src/ubuntumirclient/qmirclientscreen.cpp 2017-03-28 12:14:28 +0000
+++ src/ubuntumirclient/qmirclientscreen.cpp 2017-07-07 08:20:52 +0000
@@ -52,7 +52,7 @@
52#include <QScreen>52#include <QScreen>
53#include <QThread>53#include <QThread>
54#include <qpa/qwindowsysteminterface.h>54#include <qpa/qwindowsysteminterface.h>
55#include <QtPlatformSupport/private/qeglconvenience_p.h>55#include <QtEglSupport/private/qeglconvenience_p.h>
5656
57#include <memory>57#include <memory>
5858
5959
=== modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
--- src/ubuntumirclient/qmirclientwindow.cpp 2017-03-28 17:12:13 +0000
+++ src/ubuntumirclient/qmirclientwindow.cpp 2017-07-07 08:20:52 +0000
@@ -56,7 +56,7 @@
56#include <QSize>56#include <QSize>
57#include <QtMath>57#include <QtMath>
58#include <QtGui/private/qguiapplication_p.h>58#include <QtGui/private/qguiapplication_p.h>
59#include <QtPlatformSupport/private/qeglconvenience_p.h>59#include <QtEglSupport/private/qeglconvenience_p.h>
6060
61#include <EGL/egl.h>61#include <EGL/egl.h>
6262
6363
=== modified file 'src/ubuntumirclient/ubuntumirclient.pro'
--- src/ubuntumirclient/ubuntumirclient.pro 2017-03-29 13:39:50 +0000
+++ src/ubuntumirclient/ubuntumirclient.pro 2017-07-07 08:20:52 +0000
@@ -1,14 +1,17 @@
1TARGET = qpa-ubuntumirclient1TARGET = qpa-ubuntumirclient
2TEMPLATE = lib2TEMPLATE = lib
33
4QT -= gui4QT += \
5QT += core-private platformsupport-private dbus5 core-private dbus linuxaccessibility_support-private \
6 theme_support-private eventdispatcher_support-private \
7 fontdatabase_support-private egl_support-private
68
7CONFIG += plugin no_keywords qpa/genericunixfontdatabase9CONFIG += plugin no_keywords qpa/genericunixfontdatabase
810
9DEFINES += MESA_EGL_NO_X11_HEADERS11DEFINES += MESA_EGL_NO_X11_HEADERS
10# CONFIG += c++11 # only enables C++0x12# CONFIG += c++11 # only enables C++0x
11QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall13QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall
14QMAKE_CXXFLAGS += -Wno-error=deprecated-declarations
12QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined15QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined
1316
14CONFIG += link_pkgconfig17CONFIG += link_pkgconfig

Subscribers

People subscribed via source and target branches