Merge lp:~gerboland/qtmir/fix-qt5.4 into lp:qtmir

[Gerry Boland]

Fix build with Qt5.4

Fix build with Qt5.4

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
No, it's just to fix a FTBFS with Qt5.4
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N

[Timo Jyrinki (timo-jyrinki)]

Success! https://launchpad.net/~canonical-qt5-edgers/+archive/ubuntu/qt5-beta2/+sourcepub/4581477/+listing-archive-extra

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/qtmir-ci/156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/156/rebuild

review: Approve (continuous-integration)

=== modified file 'src/modules/Unity/Application/mirbuffersgtexture.cpp'
--- src/modules/Unity/Application/mirbuffersgtexture.cpp	2014-07-21 13:16:37 +0000
+++ src/modules/Unity/Application/mirbuffersgtexture.cpp	2014-11-21 12:41:20 +0000
@@ -88,7 +88,11 @@
 
 void MirBufferSGTexture::bind()
 {
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
     bool profileFrames = qsg_render_timing || QQuickProfiler::enabled;
+#else
+    bool profileFrames = qsg_render_timing || QQuickProfiler::profilingSceneGraph();
+#endif
     if (profileFrames)
         qsg_renderer_timer.start();
 
@@ -107,7 +111,11 @@
                (int) qsg_renderer_timer.elapsed());
     }
 
+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
     Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphTexturePrepare, (
+#else
+    Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphTexturePrepare, (
+#endif
             bindTime,  // bind (all this does)
             0,  // convert (not relevant)
             0,  // swizzle (not relevant)