QtMir

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

  1. fix-qt5.4
  2. Merge into trunk
Proposed by Gerry Boland
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 283
Merged at revision: 286
Proposed branch: lp:~gerboland/qtmir/fix-qt5.4
Merge into: lp:qtmir
Diff against target: 27 lines (+8/-0)
1 file modified
src/modules/Unity/Application/mirbuffersgtexture.cpp (+8/-0)
To merge this branch: bzr merge lp:~gerboland/qtmir/fix-qt5.4
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Timo Jyrinki (community) Approve
Review via email: mp+242485@code.launchpad.net

Commit message

Fix build with Qt5.4

Description of the change

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

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

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

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/Application/mirbuffersgtexture.cpp'
2--- src/modules/Unity/Application/mirbuffersgtexture.cpp 2014-07-21 13:16:37 +0000
3+++ src/modules/Unity/Application/mirbuffersgtexture.cpp 2014-11-21 12:41:20 +0000
4@@ -88,7 +88,11 @@
5
6 void MirBufferSGTexture::bind()
7 {
8+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
9 bool profileFrames = qsg_render_timing || QQuickProfiler::enabled;
10+#else
11+ bool profileFrames = qsg_render_timing || QQuickProfiler::profilingSceneGraph();
12+#endif
13 if (profileFrames)
14 qsg_renderer_timer.start();
15
16@@ -107,7 +111,11 @@
17 (int) qsg_renderer_timer.elapsed());
18 }
19
20+#if QT_VERSION < QT_VERSION_CHECK(5, 4, 0)
21 Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphTexturePrepare, (
22+#else
23+ Q_QUICK_SG_PROFILE(QQuickProfiler::SceneGraphTexturePrepare, (
24+#endif
25 bindTime, // bind (all this does)
26 0, // convert (not relevant)
27 0, // swizzle (not relevant)

Subscribers

People subscribed via source and target branches