qtubuntu

Merge lp:~aacid/qtubuntu/no_qtquick_megaheader into lp:qtubuntu

  1. no_qtquick_megaheader
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 197
Merged at revision: 197
Proposed branch: lp:~aacid/qtubuntu/no_qtquick_megaheader
Merge into: lp:qtubuntu
Diff against target: 14 lines (+3/-1)
1 file modified
tests/qmlscene_ubuntu/qmlscene_ubuntu.cc (+3/-1)
To merge this branch: bzr merge lp:~aacid/qtubuntu/no_qtquick_megaheader
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+196503@code.launchpad.net

Commit message

Do not include the catch-all QtQuick include

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) wrote :

Yup.

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 'tests/qmlscene_ubuntu/qmlscene_ubuntu.cc'
2--- tests/qmlscene_ubuntu/qmlscene_ubuntu.cc 2013-02-14 16:31:33 +0000
3+++ tests/qmlscene_ubuntu/qmlscene_ubuntu.cc 2013-11-25 09:32:45 +0000
4@@ -14,7 +14,9 @@
5 // this program. If not, see <http://www.gnu.org/licenses/>.
6
7 #include "qmlscene_ubuntu.h"
8-#include <QtQuick>
9+#include <QtCore/QFileInfo>
10+#include <QtGui/QGuiApplication>
11+#include <QtQuick/QQuickView>
12 #include <QtQml/qqmlengine.h>
13 #include <qpa/qplatformnativeinterface.h>
14 #include <cstdio>

Subscribers

People subscribed via source and target branches