1
=== modified file 'src/ubuntumirclient/integration.cpp'
2
--- src/ubuntumirclient/integration.cpp	2016-06-03 10:26:12 +0000
3
+++ src/ubuntumirclient/integration.cpp	2016-06-03 10:26:13 +0000
4
@@ -177,11 +177,6 @@
5
177
177
6
178
QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window) const
178
QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window) const
7
179
{
179
{
8
180
    return const_cast<UbuntuClientIntegration*>(this)->createPlatformWindow(window);
9
181
}
10
182
11
183
QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window)
12
184
{
13
185
    return new UbuntuWindow(window, mClipboard, mInput, mNativeInterface, mEglDisplay, mMirConnection);
180
    return new UbuntuWindow(window, mClipboard, mInput, mNativeInterface, mEglDisplay, mMirConnection);
14
186
}
181
}
15
187
182
16
@@ -225,12 +220,6 @@
17
225
QPlatformOpenGLContext* UbuntuClientIntegration::createPlatformOpenGLContext(
220
QPlatformOpenGLContext* UbuntuClientIntegration::createPlatformOpenGLContext(
18
226
        QOpenGLContext* context) const
221
        QOpenGLContext* context) const
19
227
{
222
{
20
228
    return const_cast<UbuntuClientIntegration*>(this)->createPlatformOpenGLContext(context);
21
229
}
22
230
23
231
QPlatformOpenGLContext* UbuntuClientIntegration::createPlatformOpenGLContext(
24
232
        QOpenGLContext* context)
25
233
{
26
234
    QSurfaceFormat format(context->format());
223
    QSurfaceFormat format(context->format());
27
235
224
28
236
    auto platformContext = new UbuntuOpenGLContext(format, context->shareHandle(), mEglDisplay);
225
    auto platformContext = new UbuntuOpenGLContext(format, context->shareHandle(), mEglDisplay);
29
237
226
30
=== modified file 'src/ubuntumirclient/integration.h'
31
--- src/ubuntumirclient/integration.h	2016-06-03 10:26:12 +0000
32
+++ src/ubuntumirclient/integration.h	2016-06-03 10:26:13 +0000
33
@@ -60,10 +60,6 @@
34
60
    void initialize() override;
60
    void initialize() override;
35
61
    QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;
61
    QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override;
36
62
62
37
63
    // non-const versions of some QPlatformIntegration methods
38
64
    QPlatformOpenGLContext* createPlatformOpenGLContext(QOpenGLContext* context);
39
65
    QPlatformWindow* createPlatformWindow(QWindow* window);
40
66
41
67
    // New methods.
63
    // New methods.
42
68
    MirConnection *mirConnection() const { return mMirConnection; }
64
    MirConnection *mirConnection() const { return mMirConnection; }
43
69
    EGLDisplay eglDisplay() const { return mEglDisplay; }
65
    EGLDisplay eglDisplay() const { return mEglDisplay; }
Status:	Merged
Approved by:	Gerry Boland on 2016-06-03
Approved revision:	342
Merged at revision:	325
Proposed branch:	lp:~gerboland/qtubuntu/minor-cleanup
Merge into:	lp:qtubuntu
Prerequisite:	lp:~gerboland/qtubuntu/adopt-more-eglconvenience2
Diff against target:	43 lines (+0/-15) 2 files modified src/ubuntumirclient/integration.cpp (+0/-11) src/ubuntumirclient/integration.h (+0/-4)
To merge this branch:	bzr merge lp:~gerboland/qtubuntu/minor-cleanup
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration	2016-06-03	Approve on 2016-06-20
Gerry Boland (community)			Approve on 2016-06-03
Daniel d'Andrada		2016-06-03	Pending
Review via email: mp+296420@code.launchpad.net