diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-10-19 18:44:12 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-11-09 09:57:34 +0000 |
| commit | 02a2cddb813aa8b518615daf31446ea456c253eb (patch) | |
| tree | 8b249cb99b995f19425330ad9782ebbd256e914a | |
| parent | 4e6d5951ed853b236b03ad46ac14649449830d96 (diff) | |
Move qqmldebug.h includes into the right places
We want then in qjsengine.h and qquickwindow.h, as that are the base
classes relevant to QML debugging and profiling.
Change-Id: Ic4b19b492cd1ec67649f40e2b7e01137aae74baf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/qml/jsapi/qjsengine.h | 2 | ||||
| -rw-r--r-- | src/qml/qml/qqmlengine.h | 1 | ||||
| -rw-r--r-- | src/quick/items/qquickview.h | 1 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.h | 1 | ||||
| -rw-r--r-- | src/quickwidgets/qquickwidget.h | 1 |
5 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsapi/qjsengine.h b/src/qml/jsapi/qjsengine.h index f92a26445f..913757107f 100644 --- a/src/qml/jsapi/qjsengine.h +++ b/src/qml/jsapi/qjsengine.h @@ -47,6 +47,8 @@ #include <QtCore/qobject.h> #include <QtQml/qjsvalue.h> +#include <QtQml/qqmldebug.h> + QT_BEGIN_NAMESPACE diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index b775054253..937920e191 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -46,7 +46,6 @@ #include <QtQml/qjsengine.h> #include <QtQml/qqml.h> #include <QtQml/qqmlerror.h> -#include <QtQml/qqmldebug.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h index 142607fa39..014d02e7f5 100644 --- a/src/quick/items/qquickview.h +++ b/src/quick/items/qquickview.h @@ -42,7 +42,6 @@ #include <QtQuick/qquickwindow.h> #include <QtCore/qurl.h> -#include <QtQml/qqmldebug.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 58cfff5ace..e5b54c8fb9 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -47,6 +47,7 @@ #include <QtGui/qwindow.h> #include <QtGui/qevent.h> #include <QtQml/qqml.h> +#include <QtQml/qqmldebug.h> QT_BEGIN_NAMESPACE diff --git a/src/quickwidgets/qquickwidget.h b/src/quickwidgets/qquickwidget.h index e7fbc62967..8c9382e84b 100644 --- a/src/quickwidgets/qquickwidget.h +++ b/src/quickwidgets/qquickwidget.h @@ -43,7 +43,6 @@ #include <QtWidgets/qwidget.h> #include <QtQuick/qquickwindow.h> #include <QtCore/qurl.h> -#include <QtQml/qqmldebug.h> #include <QtQuickWidgets/qtquickwidgetsglobal.h> #include <QtGui/qimage.h> |