unity-mir

Merge lp:~aacid/unity-mir/nomegaheader into lp:unity-mir

  1. nomegaheader
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 144
Merged at revision: 144
Proposed branch: lp:~aacid/unity-mir/nomegaheader
Merge into: lp:unity-mir
Diff against target: 12 lines (+1/-1)
1 file modified
src/modules/Unity/Application/plugin.cpp (+1/-1)
To merge this branch: bzr merge lp:~aacid/unity-mir/nomegaheader
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+195823@code.launchpad.net

Commit message

Don't include the QtQml megaheader

Include the one we really need

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
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/plugin.cpp'
2--- src/modules/Unity/Application/plugin.cpp 2013-10-09 15:24:16 +0000
3+++ src/modules/Unity/Application/plugin.cpp 2013-11-19 16:44:51 +0000
4@@ -15,7 +15,7 @@
5 */
6
7 // Qt
8-#include <QtQml/QtQml>
9+#include <QQmlExtensionPlugin>
10
11 // local
12 #include "application.h"

Subscribers

People subscribed via source and target branches