diff options
-rw-r--r-- | src/quick/items/qquickitem_p.h | 39 | ||||
-rw-r--r-- | src/quick/items/qquickscreen.cpp | 11 | ||||
-rw-r--r-- | src/quick/items/qquickscreen_p.h | 6 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.h | 3 | ||||
-rw-r--r-- | src/quick/items/qquickwindow_p.h | 10 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp | 2 | ||||
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgrhivisualizer.cpp | 1 | ||||
-rw-r--r-- | src/quick/util/qquickanimatorcontroller.cpp | 1 | ||||
-rw-r--r-- | src/quick/util/qquickanimatorjob.cpp | 1 | ||||
-rw-r--r-- | src/quick/util/qquickapplication.cpp | 16 | ||||
-rw-r--r-- | src/quick/util/qquickapplication_p.h | 13 | ||||
-rw-r--r-- | src/quick/util/qquickglobal.cpp | 10 | ||||
-rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 55 |
13 files changed, 79 insertions, 89 deletions
diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index 395dfee496..4b21740b0f 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -51,35 +51,32 @@ // We mean it. // -#include "qquickitem.h" - -#include "qquickanchors_p.h" -#include "qquickanchors_p_p.h" -#include "qquickitemchangelistener_p.h" -#include "qquickevents_p_p.h" +#include <QtQuick/private/qquickanchors_p.h> +#include <QtQuick/private/qquickanchors_p_p.h> +#include <QtQuick/private/qquickitemchangelistener_p.h> +#include <QtQuick/private/qquickevents_p_p.h> +#include <QtQuick/private/qquickclipnode_p.h> +#include <QtQuick/private/qquickstate_p.h> +#include <QtQuick/private/qquickpaletteproviderprivatebase_p.h> +#include <QtQuick/private/qquickwindow_p.h> -#include "qquickwindow_p.h" +#if QT_CONFIG(quick_shadereffect) +#include <QtQuick/private/qquickshadereffectsource_p.h> +#endif +#include <QtQuick/qquickitem.h> #include <QtQuick/qsgnode.h> -#include "qquickclipnode_p.h" -#include <QtQuick/private/qquickstate_p.h> -#include <private/qqmlnullablevalue_p.h> -#include <private/qqmlnotifier_p.h> -#include <private/qqmlglobal_p.h> -#include <private/qlazilyallocated_p.h> - -#include <qqml.h> -#include <qqmlcontext.h> +#include <QtQml/private/qqmlnullablevalue_p.h> +#include <QtQml/private/qqmlnotifier_p.h> +#include <QtQml/private/qqmlglobal_p.h> +#include <QtQml/private/qlazilyallocated_p.h> +#include <QtQml/qqml.h> +#include <QtQml/qqmlcontext.h> #include <QtCore/qlist.h> #include <QtCore/qdebug.h> #include <QtCore/qelapsedtimer.h> -#include <QtQuick/private/qquickpaletteproviderprivatebase_p.h> - -#if QT_CONFIG(quick_shadereffect) -#include <QtQuick/private/qquickshadereffectsource_p.h> -#endif QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickscreen.cpp b/src/quick/items/qquickscreen.cpp index 9a2799ae96..10701efbfa 100644 --- a/src/quick/items/qquickscreen.cpp +++ b/src/quick/items/qquickscreen.cpp @@ -37,14 +37,13 @@ ** ****************************************************************************/ -#include "qquickscreen_p.h" +#include <QtQuick/private/qquickscreen_p.h> +#include <QtQuick/qquickwindow.h> -#include "qquickitem.h" -#include "qquickitem_p.h" -#include "qquickwindow.h" +#include <QtQuick/private/qquickitem_p.h> -#include <QGuiApplication> -#include <QScreen> +#include <QtGui/qguiapplication.h> +#include <QtGui/qscreen.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickscreen_p.h b/src/quick/items/qquickscreen_p.h index d8faa7d47d..d0f1627e37 100644 --- a/src/quick/items/qquickscreen_p.h +++ b/src/quick/items/qquickscreen_p.h @@ -51,10 +51,8 @@ // We mean it. // -#include <qqml.h> -#include <QRect> -#include <QSize> -#include <private/qtquickglobal_p.h> +#include <QtQml/qqml.h> +#include <QtQuick/private/qtquickglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index e78e56b1de..ed24d01c05 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -42,8 +42,9 @@ #include <QtQuick/qtquickglobal.h> #include <QtQuick/qsgrendererinterface.h> + #include <QtCore/qmetatype.h> -#include <qopengl.h> +#include <QtGui/qopengl.h> #include <QtGui/qwindow.h> #include <QtGui/qevent.h> #include <QtQml/qqml.h> diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index a65b87f8b6..67dc0e92d8 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -51,20 +51,20 @@ // We mean it. // -#include "qquickitem.h" -#include "qquickwindow.h" -#include "qquickevents_p_p.h" - +#include <QtQuick/private/qquickevents_p_p.h> #include <QtQuick/private/qsgcontext_p.h> #include <QtQuick/private/qquickpaletteproviderprivatebase_p.h> #include <QtQuick/private/qquickrendertarget_p.h> #include <QtQuick/private/qquickgraphicsdevice_p.h> +#include <QtQuick/qquickitem.h> +#include <QtQuick/qquickwindow.h> #include <QtCore/qthread.h> #include <QtCore/qmutex.h> #include <QtCore/qwaitcondition.h> #include <QtCore/qrunnable.h> -#include <private/qwindow_p.h> + +#include <QtGui/private/qwindow_p.h> #include <QtGui/qevent.h> #include <QtGui/qstylehints.h> #include <QtGui/qguiapplication.h> diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp index 88c06cb592..80280e749b 100644 --- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp +++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp @@ -41,8 +41,6 @@ #include "qsgbatchrenderer_p.h" -#include <QQuickWindow> - #include <qmath.h> #include <QtCore/QElapsedTimer> diff --git a/src/quick/scenegraph/coreapi/qsgrhivisualizer.cpp b/src/quick/scenegraph/coreapi/qsgrhivisualizer.cpp index b26cba3ac3..f02cb50eb4 100644 --- a/src/quick/scenegraph/coreapi/qsgrhivisualizer.cpp +++ b/src/quick/scenegraph/coreapi/qsgrhivisualizer.cpp @@ -41,7 +41,6 @@ #include "qsgrhivisualizer_p.h" #include <qmath.h> -#include <QQuickWindow> #include <private/qsgmaterialshader_p.h> #include <private/qsgshadersourcebuilder_p.h> diff --git a/src/quick/util/qquickanimatorcontroller.cpp b/src/quick/util/qquickanimatorcontroller.cpp index ad9d4b08cd..9b60fe7ae0 100644 --- a/src/quick/util/qquickanimatorcontroller.cpp +++ b/src/quick/util/qquickanimatorcontroller.cpp @@ -40,7 +40,6 @@ #include "qquickanimatorcontroller_p.h" -#include <private/qquickwindow_p.h> #include <private/qquickitem_p.h> #include <private/qsgrenderloop_p.h> diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp index 642329dcaf..8879ef1e57 100644 --- a/src/quick/util/qquickanimatorjob.cpp +++ b/src/quick/util/qquickanimatorjob.cpp @@ -42,7 +42,6 @@ #include "qquickanimatorjob_p.h" #include "qquickanimator_p.h" #include "qquickanimator_p_p.h" -#include <private/qquickwindow_p.h> #include <private/qquickitem_p.h> #if QT_CONFIG(quick_shadereffect) && QT_CONFIG(opengl) # include <private/qquickopenglshadereffectnode_p.h> diff --git a/src/quick/util/qquickapplication.cpp b/src/quick/util/qquickapplication.cpp index e0d032b074..fef87bd931 100644 --- a/src/quick/util/qquickapplication.cpp +++ b/src/quick/util/qquickapplication.cpp @@ -37,15 +37,17 @@ ** ****************************************************************************/ -#include "qquickapplication_p.h" -#include <private/qquickscreen_p.h> -#include <private/qobject_p.h> -#include <private/qguiapplication_p.h> -#include <qpa/qplatformintegration.h> -#include <QtGui/QGuiApplication> -#include <QtCore/QDebug> +#include <QtQuick/private/qquickapplication_p.h> + +#include <QtGui/private/qguiapplication_p.h> +#include <QtGui/qpa/qplatformintegration.h> +#include <QtGui/qguiapplication.h> + #include <QtQml/private/qqmlglobal_p.h> +#include <QtCore/private/qobject_p.h> +#include <QtCore/qdebug.h> + QT_BEGIN_NAMESPACE /* diff --git a/src/quick/util/qquickapplication_p.h b/src/quick/util/qquickapplication_p.h index a740067bf3..2540f41ab0 100644 --- a/src/quick/util/qquickapplication_p.h +++ b/src/quick/util/qquickapplication_p.h @@ -51,12 +51,15 @@ // We mean it. // -#include <QtCore/QObject> -#include <QtGui/QFont> -#include <qqml.h> +#include <QtQuick/private/qtquickglobal_p.h> +#include <QtQuick/private/qquickscreen_p.h> + +#include <QtQml/qqml.h> #include <QtQml/private/qqmlglobal_p.h> -#include <private/qtquickglobal_p.h> -#include "../items/qquickscreen_p.h" + +#include <QtGui/qfont.h> + +#include <QtCore/qobject.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index e8439121ca..f5d4a54e74 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -38,17 +38,17 @@ ** ****************************************************************************/ -#include <private/qquickvaluetypes_p.h> -#include <private/qquickapplication_p.h> -#include <private/qqmlglobal_p.h> +#include <QtQuick/private/qquickvaluetypes_p.h> +#include <QtQuick/private/qquickapplication_p.h> #include <QtGui/QGuiApplication> #include <QtGui/qdesktopservices.h> #include <QtGui/qfontdatabase.h> #include <QtGui/qstylehints.h> -#include <private/qv4engine_p.h> -#include <private/qv4object_p.h> +#include <QtQml/private/qqmlglobal_p.h> +#include <QtQml/private/qv4engine_p.h> +#include <QtQml/private/qv4object_p.h> #ifdef Q_CC_MSVC // MSVC2010 warns about 'unused variable t', even if it's used in t->~T() diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index 8dde8fbdd9..891e3836b0 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -37,44 +37,39 @@ ** ****************************************************************************/ -#include "qquickpixmapcache_p.h" -#include <qquickimageprovider.h> -#include "qquickimageprovider_p.h" - -#include <qqmlengine.h> -#include <private/qqmlglobal_p.h> -#include <private/qqmlengine_p.h> - -#include <QtGui/private/qguiapplication_p.h> -#include <QtGui/private/qimage_p.h> -#include <qpa/qplatformintegration.h> - +#include <QtQuick/private/qquickpixmapcache_p.h> +#include <QtQuick/private/qquickimageprovider_p.h> +#include <QtQuick/private/qquickprofiler_p.h> #include <QtQuick/private/qsgcontext_p.h> #include <QtQuick/private/qsgtexturereader_p.h> +#include <QtQuick/qquickwindow.h> -#include <QQuickWindow> -#include <QCoreApplication> -#include <QImageReader> -#include <QHash> -#include <QPixmapCache> -#include <QFile> -#include <QThread> -#include <QMutex> -#include <QMutexLocker> -#include <QBuffer> +#include <QtGui/private/qguiapplication_p.h> +#include <QtGui/private/qimage_p.h> +#include <QtGui/qpa/qplatformintegration.h> +#include <QtGui/qimagereader.h> +#include <QtGui/qpixmapcache.h> + +#include <QtQml/private/qqmlglobal_p.h> +#include <QtQml/private/qqmlengine_p.h> +#include <QtQml/qqmlfile.h> + +#include <QtCore/private/qobject_p.h> +#include <QtCore/qcoreapplication.h> +#include <QtCore/qhash.h> +#include <QtCore/qfile.h> +#include <QtCore/qthread.h> +#include <QtCore/qmutex.h> +#include <QtCore/qbuffer.h> #include <QtCore/qdebug.h> -#include <private/qobject_p.h> -#include <QQmlFile> -#include <QMetaMethod> +#include <QtCore/qmetaobject.h> #if QT_CONFIG(qml_network) -#include <qqmlnetworkaccessmanagerfactory.h> -#include <QNetworkReply> -#include <QSslError> +#include <QtQml/qqmlnetworkaccessmanagerfactory.h> +#include <QtNetwork/qnetworkreply.h> +#include <QtNetwork/qsslerror.h> #endif -#include <private/qquickprofiler_p.h> - #define IMAGEREQUEST_MAX_NETWORK_REQUEST_COUNT 8 #define IMAGEREQUEST_MAX_REDIRECT_RECURSION 16 #define CACHE_EXPIRE_TIME 30 |