git.iko.soy/unity8
on xenial help sign in
Don't include QtQML
230e958Albert Astals
main.cpp−1
compare with xenial
unifiedsplit
@@ -18,7 +18,6 @@
18 */
18 */
19
19
20// Qt
20// Qt
21−#include <QtQml>
22#include <QtQuick/QQuickView>
21#include <QtQuick/QQuickView>
23#include <QtGui/QIcon>
22#include <QtGui/QIcon>
24#include <QtGui/QGuiApplication>
23#include <QtGui/QGuiApplication>
plugins/LightDM/plugin.cpp+1−1
@@ -25,7 +25,7 @@
25#include <QLightDM/UsersModel>
25#include <QLightDM/UsersModel>
26
26
27#include <QtCore/QAbstractItemModel>
27#include <QtCore/QAbstractItemModel>
28−#include <QtQml>
28+#include <QtQml/qqml.h>
29
29
30static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
30static QObject *greeter_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
31{
31{
plugins/Powerd/plugin.cpp+1−1
@@ -20,7 +20,7 @@
20#include "plugin.h"
20#include "plugin.h"
21#include "Powerd.h"
21#include "Powerd.h"
22
22
23−#include <QtQml/QtQml>
23+#include <QtQml/qqml.h>
24
24
25static QObject *powerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
25static QObject *powerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
26{
26{
plugins/Ubuntu/DownloadDaemonListener/plugin.cpp+1−1
@@ -22,7 +22,7 @@
22#include "plugin.h"
22#include "plugin.h"
23#include "DownloadTracker.h"
23#include "DownloadTracker.h"
24
24
25−#include <QtQml>
25+#include <QtQml/qqml.h>
26#include <QtQml/QQmlContext>
26#include <QtQml/QQmlContext>
27
27
28
28
plugins/Unity/Indicators/Network/plugin.cpp+1−1
@@ -17,7 +17,7 @@
17 */
17 */
18
18
19// Qt
19// Qt
20−#include <QtQml>
20+#include <QtQml/qqml.h>
21
21
22// self
22// self
23#include "plugin.h"
23#include "plugin.h"
plugins/Unity/Indicators/plugin.cpp+1−1
@@ -18,7 +18,7 @@
18 */
18 */
19
19
20// Qt
20// Qt
21−#include <QtQml>
21+#include <QtQml/qqml.h>
22
22
23// self
23// self
24#include "plugin.h"
24#include "plugin.h"
plugins/Unity/IndicatorsLegacy/Network/plugin.cpp+1−1
@@ -17,7 +17,7 @@
17 */
17 */
18
18
19// Qt
19// Qt
20−#include <QtQml>
20+#include <QtQml/qqml.h>
21
21
22// self
22// self
23#include "plugin.h"
23#include "plugin.h"
plugins/Unity/IndicatorsLegacy/plugin.cpp+1−1
@@ -17,7 +17,7 @@
17 */
17 */
18
18
19// Qt
19// Qt
20−#include <QtQml>
20+#include <QtQml/qqml.h>
21
21
22// self
22// self
23#include "plugin.h"
23#include "plugin.h"
plugins/Unity/Launcher/plugin.cpp+1−1
@@ -18,7 +18,7 @@
18 */
18 */
19
19
20// Qt
20// Qt
21−#include <QtQml>
21+#include <QtQml/qqml.h>
22
22
23// self
23// self
24#include "plugin.h"
24#include "plugin.h"
plugins/Unity/plugin.cpp+2−1
@@ -17,8 +17,9 @@
17 */
17 */
18
18
19// Qt
19// Qt
20−#include <QtQml>
21#include <QDBusConnection>
20#include <QDBusConnection>
21+#include <QQmlContext>
22+#include <qqml.h>
22
23
23// self
24// self
24#include "plugin.h"
25#include "plugin.h"
plugins/Utils/plugin.cpp+1−1
@@ -17,7 +17,7 @@
17 */
17 */
18
18
19// Qt
19// Qt
20−#include <QtQml>
20+#include <QtQml/qqml.h>
21#include <QtQuick/QQuickWindow>
21#include <QtQuick/QQuickWindow>
22
22
23// self
23// self
tests/mocks/GSettings.1.0/fake_gsettings.h+1−1
@@ -18,7 +18,7 @@
18#define FAKE_GSETTINGS_H
18#define FAKE_GSETTINGS_H
19
19
20#include <QList>
20#include <QList>
21−#include <QtQml>
21+#include <QObject>
22
22
23class GSettingsSchemaQml: public QObject
23class GSettingsSchemaQml: public QObject
24{
24{
tests/mocks/GSettings.1.0/plugin.cpp+1−1
@@ -17,7 +17,7 @@
17#include "plugin.h"
17#include "plugin.h"
18#include "fake_gsettings.h"
18#include "fake_gsettings.h"
19
19
20−#include <QtQml>
20+#include <QtQml/qqml.h>
21
21
22static QObject* controllerProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
22static QObject* controllerProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)
23{
23{
tests/mocks/Powerd/plugin.cpp+1−1
@@ -19,7 +19,7 @@
19#include "plugin.h"
19#include "plugin.h"
20#include "Powerd.h"
20#include "Powerd.h"
21
21
22−#include <QtQml/QtQml>
22+#include <QtQml/qqml.h>
23
23
24static QObject *powerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
24static QObject *powerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
25{
25{
tests/mocks/Ubuntu/DownloadDaemonListener/plugin.cpp−1
@@ -17,7 +17,6 @@
17#include "plugin.h"
17#include "plugin.h"
18#include "MockDownloadTracker.h"
18#include "MockDownloadTracker.h"
19
19
20−#include <QtQml>
21#include <QtQml/QQmlContext>
20#include <QtQml/QQmlContext>
22#include <qqml.h>
21#include <qqml.h>
23
22
tests/mocks/Unity/Indicators/fakeplugin.cpp+1−1
@@ -17,7 +17,7 @@
17 */
17 */
18
18
19// Qt
19// Qt
20−#include <QtQml>
20+#include <QtQml/qqml.h>
21
21
22// self
22// self
23#include "fakeplugin.h"
23#include "fakeplugin.h"
tests/mocks/Unity/fake_unity_plugin.cpp+2−1
@@ -26,7 +26,8 @@
26
26
27// External
27// External
28#include <glib-object.h>
28#include <glib-object.h>
29+
29−#include <QtQml>
30+#include <QtQml/qqml.h>
30
31
31void FakeUnityPlugin::registerTypes(const char *uri)
32void FakeUnityPlugin::registerTypes(const char *uri)
32{
33{
tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.h+1−1
@@ -19,7 +19,7 @@
19
19
20#include <QtCore/QObject>
20#include <QtCore/QObject>
21#include <QtTest/QTest>
21#include <QtTest/QTest>
22−#include <QtQml/QtQml>
22+#include <QtQml/qqml.h>
23
23
24class TouchEventSequenceWrapper : public QObject
24class TouchEventSequenceWrapper : public QObject
25{
25{