diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2014-03-10 00:03:58 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-11 01:23:33 +0100 |
| commit | c8acc9ef849977f09f26a397de3812f81c740efa (patch) | |
| tree | 6e9b79d06a19af055bed091f305de246f06f3c44 /src/dialogs | |
| parent | 1b15111c90b4bc366d8c6ae27e4fe46d9e52c074 (diff) | |
| download | qtquickcontrols-c8acc9ef849977f09f26a397de3812f81c740efa.tar.gz | |
Replace module includes in dialogs
Replace a number of QtQml module inclusions with their more specific
counterparts, possibly leading to decreased compilation time.
Change-Id: I9b48b06e884d46c6440725a704951dc87e2e93db
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/dialogs')
| -rw-r--r-- | src/dialogs/plugin.cpp | 1 | ||||
| -rw-r--r-- | src/dialogs/qquickabstractcolordialog_p.h | 1 | ||||
| -rw-r--r-- | src/dialogs/qquickabstractdialog_p.h | 2 | ||||
| -rw-r--r-- | src/dialogs/qquickabstractfiledialog_p.h | 1 | ||||
| -rw-r--r-- | src/dialogs/qquickabstractfontdialog_p.h | 1 | ||||
| -rw-r--r-- | src/dialogs/qquickabstractmessagedialog_p.h | 1 | ||||
| -rw-r--r-- | src/dialogs/qquickdialog.cpp | 2 | ||||
| -rw-r--r-- | src/dialogs/qquickdialog_p.h | 1 | ||||
| -rw-r--r-- | src/dialogs/qquickfiledialog.cpp | 1 | ||||
| -rw-r--r-- | src/dialogs/qquickfiledialog_p.h | 2 |
10 files changed, 8 insertions, 5 deletions
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 7c8c6bea..74672f65 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -41,6 +41,7 @@ #include <QtQml/qqml.h> #include <QtQml/qqmlextensionplugin.h> +#include <QtQml/qqmlcomponent.h> #include "qquickmessagedialog_p.h" #include "qquickabstractmessagedialog_p.h" #include "qquickdialogassets_p.h" diff --git a/src/dialogs/qquickabstractcolordialog_p.h b/src/dialogs/qquickabstractcolordialog_p.h index ad2c7ce1..ca6a433c 100644 --- a/src/dialogs/qquickabstractcolordialog_p.h +++ b/src/dialogs/qquickabstractcolordialog_p.h @@ -53,7 +53,6 @@ // We mean it. // -#include <QtQml> #include <QQuickView> #include <QtGui/qpa/qplatformdialoghelper.h> #include <qpa/qplatformtheme.h> diff --git a/src/dialogs/qquickabstractdialog_p.h b/src/dialogs/qquickabstractdialog_p.h index 5a408530..79283c19 100644 --- a/src/dialogs/qquickabstractdialog_p.h +++ b/src/dialogs/qquickabstractdialog_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtQml> +#include <QtQml/qqml.h> #include <QQuickView> #include <QtGui/qpa/qplatformdialoghelper.h> #include <qpa/qplatformtheme.h> diff --git a/src/dialogs/qquickabstractfiledialog_p.h b/src/dialogs/qquickabstractfiledialog_p.h index 0860ce36..412f418a 100644 --- a/src/dialogs/qquickabstractfiledialog_p.h +++ b/src/dialogs/qquickabstractfiledialog_p.h @@ -53,7 +53,6 @@ // We mean it. // -#include <QtQml> #include <QQuickView> #include <QtGui/qpa/qplatformdialoghelper.h> #include <qpa/qplatformtheme.h> diff --git a/src/dialogs/qquickabstractfontdialog_p.h b/src/dialogs/qquickabstractfontdialog_p.h index 2156eb79..d7ab1d47 100644 --- a/src/dialogs/qquickabstractfontdialog_p.h +++ b/src/dialogs/qquickabstractfontdialog_p.h @@ -53,7 +53,6 @@ // We mean it. // -#include <QtQml> #include <QQuickView> #include <QtGui/qpa/qplatformdialoghelper.h> #include <QtGui/qfont.h> diff --git a/src/dialogs/qquickabstractmessagedialog_p.h b/src/dialogs/qquickabstractmessagedialog_p.h index 6c1d7f2d..de18cbe5 100644 --- a/src/dialogs/qquickabstractmessagedialog_p.h +++ b/src/dialogs/qquickabstractmessagedialog_p.h @@ -53,7 +53,6 @@ // We mean it. // -#include <QtQml> #include <QQuickView> #include <QtGui/qpa/qplatformdialoghelper.h> #include <qpa/qplatformtheme.h> diff --git a/src/dialogs/qquickdialog.cpp b/src/dialogs/qquickdialog.cpp index b7eefcc4..e7660c53 100644 --- a/src/dialogs/qquickdialog.cpp +++ b/src/dialogs/qquickdialog.cpp @@ -41,6 +41,8 @@ #include "qquickdialog_p.h" #include <QQuickItem> +#include <QQmlEngine> +#include <QStandardPaths> #include <private/qguiapplication_p.h> QT_BEGIN_NAMESPACE diff --git a/src/dialogs/qquickdialog_p.h b/src/dialogs/qquickdialog_p.h index e9a96612..54718221 100644 --- a/src/dialogs/qquickdialog_p.h +++ b/src/dialogs/qquickdialog_p.h @@ -54,6 +54,7 @@ // #include "qquickabstractmessagedialog_p.h" +#include <QJSValue> QT_BEGIN_NAMESPACE diff --git a/src/dialogs/qquickfiledialog.cpp b/src/dialogs/qquickfiledialog.cpp index 3891308d..68beca28 100644 --- a/src/dialogs/qquickfiledialog.cpp +++ b/src/dialogs/qquickfiledialog.cpp @@ -41,6 +41,7 @@ #include "qquickfiledialog_p.h" #include <QQuickItem> +#include <QQmlEngine> #include <private/qguiapplication_p.h> #include <private/qv4object_p.h> diff --git a/src/dialogs/qquickfiledialog_p.h b/src/dialogs/qquickfiledialog_p.h index 19d8cac0..0cfef472 100644 --- a/src/dialogs/qquickfiledialog_p.h +++ b/src/dialogs/qquickfiledialog_p.h @@ -54,6 +54,8 @@ // #include "qquickabstractfiledialog_p.h" +#include <QJSValue> +#include <QStandardPaths> QT_BEGIN_NAMESPACE |