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

[Timo Jyrinki]

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

[Timo Jyrinki (timo-jyrinki)]

(should it work for Qt 5.4 too?)
< zsombi> yes, it shoudl work

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1694
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2405/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1135
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1135/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1132

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2405/rebuild

review: Approve (continuous-integration)

[Zsombor Egri (zsombi)]

Harmless for earlier versions.

review: Approve

=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp'
--- src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-10-12 17:20:30 +0000
+++ src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-10-21 12:56:55 +0000
@@ -34,7 +34,9 @@
 #include <QtGui/QScreen>
 #include <QtQuick/QQuickWindow>
 #include <QtQuick/QSGTextureProvider>
+#define emit Q_EMIT
 #include <QtQuick/private/qquickimage_p.h>
+#undef emit
 #include <QtQuick/private/qsgadaptationlayer_p.h>
 #include <QtQml/qqmlinfo.h>
 #include <math.h>