diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-10 10:35:45 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-19 15:28:18 +0200 |
| commit | 784a877d3cd9a1a75aca9c83146389503a966071 (patch) | |
| tree | cb6822bf739cc63383ac3ed4bac2b6bb61e15a3a /src/gui/kernel | |
| parent | 208996751333933be601b4cccdd99c924d07436f (diff) | |
Move QWindowSystemInterface out of qpa.
Public QtTest headers require it, so all unit tests would have to use private Qt
headers otherwise, which is not practical.
Change-Id: I5d4466ec30b6a57ebdfc34413e716e657eb51368
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformwindow.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index aa039cc947..c028e42e2c 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -74,8 +74,8 @@ #include <qpa/qplatforminputcontext.h> #include <qpa/qplatforminputcontext_p.h> -#include <qpa/qwindowsysteminterface.h> -#include <qpa/qwindowsysteminterface_p.h> +#include <QtGui/qwindowsysteminterface.h> +#include <private/qwindowsysteminterface_p.h> #include "private/qwindow_p.h" #include "private/qcursor_p.h" diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 58a82a9cc5..b3cafc5d2c 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -49,8 +49,8 @@ #include <QtCore/private/qthread_p.h> -#include <qpa/qwindowsysteminterface.h> -#include <qpa/qwindowsysteminterface_p.h> +#include <QWindowSystemInterface> +#include "private/qwindowsysteminterface_p.h" #include "private/qshortcutmap_p.h" #include <qicon.h> diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index 8de647c160..fe674705af 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -41,7 +41,7 @@ #include "qplatformwindow.h" -#include <qpa/qwindowsysteminterface.h> +#include <QtGui/qwindowsysteminterface.h> #include <QtGui/qwindow.h> #include <QtGui/qscreen.h> |