Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/workaround_qt55_emit_declaration into lp:ubuntu-ui-toolkit/staging

Proposed by Timo Jyrinki on 2015-10-21
Status: Merged
Approved by: Zsombor Egri on 2015-10-22
Approved revision: 1694
Merged at revision: 1698
Proposed branch: lp:~timo-jyrinki/ubuntu-ui-toolkit/workaround_qt55_emit_declaration
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 13 lines (+2/-0)
1 file modified
src/Ubuntu/Components/plugin/ucubuntushape.cpp (+2/-0)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/workaround_qt55_emit_declaration
Reviewer Review Type Date Requested Status
Zsombor Egri 2015-10-21 Approve on 2015-10-22
PS Jenkins bot continuous-integration Approve on 2015-10-21
Review via email: mp+275183@code.launchpad.net

Commit message

Workaround 'emit' declaration in Qt 5.5 (LP: #1507910)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp'
2--- src/Ubuntu/Components/plugin/ucubuntushape.cpp 2015-10-12 17:20:30 +0000
3+++ src/Ubuntu/Components/plugin/ucubuntushape.cpp 2015-10-21 12:56:55 +0000
4@@ -34,7 +34,9 @@
5 #include <QtGui/QScreen>
6 #include <QtQuick/QQuickWindow>
7 #include <QtQuick/QSGTextureProvider>
8+#define emit Q_EMIT
9 #include <QtQuick/private/qquickimage_p.h>
10+#undef emit
11 #include <QtQuick/private/qsgadaptationlayer_p.h>
12 #include <QtQml/qqmlinfo.h>
13 #include <math.h>

Subscribers

People subscribed via source and target branches