diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-05-07 23:39:03 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-08 22:38:12 +0200 |
| commit | 44340565e89d13bcb3eb8d3807b0682c976bdde9 (patch) | |
| tree | 36ca383f848ee79001dec3ab21c78f8fa153b79d | |
| parent | a5f1cec896c514a94f243f4adf3660e4b03a41ef (diff) | |
Adapt to _qpa file rename in qtbase.
qtbase change 36547f4eff44361f7a6acd0cff107c0e47561f93
renamed qpa headers.
Change-Id: I903b48d145837557d305366e2eb4eedd0ad32c14
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| -rw-r--r-- | src/quick/items/qquickwindowmanager.cpp | 2 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 4 | ||||
| -rw-r--r-- | src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/shared/platforminputcontext.h | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp index 9b51bf2d34..da1f91da11 100644 --- a/src/quick/items/qquickwindowmanager.cpp +++ b/src/quick/items/qquickwindowmanager.cpp @@ -49,7 +49,7 @@ #include <QtGui/QOpenGLContext> #include <QtGui/private/qguiapplication_p.h> -#include <QtGui/qplatformintegration_qpa.h> +#include <qpa/qplatformintegration.h> #include <QtQml/private/qqmlglobal_p.h> diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index da1c8e6ee9..379a81ecdf 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -60,9 +60,9 @@ #include <QtQuick/private/qsgtexture_p.h> #include <QtGui/private/qguiapplication_p.h> -#include <QtGui/QPlatformIntegration> +#include <qpa/qplatformintegration.h> -#include <QtGui/qplatformsharedgraphicscache_qpa.h> +#include <qpa/qplatformsharedgraphicscache.h> #include <private/qobject_p.h> #include <qmutex.h> diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp index 536adb0ae1..a204550fe2 100644 --- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp +++ b/src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp @@ -50,7 +50,7 @@ #include <QtCore/qhash.h> #include <QtCore/qthread.h> -#include <QtGui/qplatformsharedgraphicscache_qpa.h> +#include <qpa/qplatformsharedgraphicscache.h> #include <QtQuick/qquickcanvas.h> diff --git a/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp b/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp index 38fb02d085..8b4b63f19f 100644 --- a/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp +++ b/tests/auto/quick/qquickdroparea/tst_qquickdroparea.cpp @@ -48,7 +48,7 @@ #include <QtQml/qqmlexpression.h> #include <QtGui/qwindowsysteminterface_qpa.h> -#include <QtGui/qplatformdrag_qpa.h> +#include <qpa/qplatformdrag.h> template <typename T> static T evaluate(QObject *scope, const QString &expression) { diff --git a/tests/auto/shared/platforminputcontext.h b/tests/auto/shared/platforminputcontext.h index e77cbf34a1..70b48abe29 100644 --- a/tests/auto/shared/platforminputcontext.h +++ b/tests/auto/shared/platforminputcontext.h @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <qplatforminputcontext_qpa.h> +#include <qpa/qplatforminputcontext.h> #include <QtGui/QInputMethod> class PlatformInputContext : public QPlatformInputContext |