diff options
-rw-r--r-- | src/gui/kernel/kernel.pri | 6 | ||||
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwidget.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwidgetwindow_qpa_p.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.cpp (renamed from src/gui/kernel/qwindow_qpa.cpp) | 4 | ||||
-rw-r--r-- | src/gui/kernel/qwindow.h (renamed from src/gui/kernel/qwindow_qpa.h) | 0 | ||||
-rw-r--r-- | src/gui/kernel/qwindow_p.h (renamed from src/gui/kernel/qwindow_qpa_p.h) | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwindowcontext_qpa.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qwindowsurface.cpp | 4 | ||||
-rw-r--r-- | src/gui/painting/qwindowsurface_p.h | 2 |
10 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 8cd6249584..ea86977cf6 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -206,8 +206,8 @@ qpa { kernel/qguiapplication.h \ kernel/qguiapplication_p.h \ kernel/qwidgetwindow_qpa_p.h \ - kernel/qwindow_qpa_p.h \ - kernel/qwindow_qpa.h + kernel/qwindow_p.h \ + kernel/qwindow.h SOURCES += \ kernel/qapplication_qpa.cpp \ @@ -236,7 +236,7 @@ qpa { kernel/qwindowformat_qpa.cpp \ kernel/qguiapplication.cpp \ kernel/qwidgetwindow_qpa.cpp \ - kernel/qwindow_qpa.cpp + kernel/qwindow.cpp contains(QT_CONFIG, glib) { SOURCES += \ diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 2e2ca66f3e..2230c86469 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -61,7 +61,7 @@ #include <QWindowSystemInterface> #include "private/qwindowsysteminterface_qpa_p.h" -#include "private/qwindow_qpa_p.h" +#include "private/qwindow_p.h" #ifndef QT_NO_CLIPBOARD #include <QtGui/QClipboard> diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h index 03643646f8..7186c441f6 100644 --- a/src/gui/kernel/qwidget.h +++ b/src/gui/kernel/qwidget.h @@ -57,7 +57,7 @@ #include <QtGui/qkeysequence.h> #ifdef Q_WS_QPA //should this go somewhere else? -#include <QtGui/qwindow_qpa.h> +#include <QtGui/qwindow.h> #include <QtGui/qwindowformat_qpa.h> #endif diff --git a/src/gui/kernel/qwidgetwindow_qpa_p.h b/src/gui/kernel/qwidgetwindow_qpa_p.h index 0780af1c72..9d577d17f3 100644 --- a/src/gui/kernel/qwidgetwindow_qpa_p.h +++ b/src/gui/kernel/qwidgetwindow_qpa_p.h @@ -42,7 +42,7 @@ #ifndef QWIDGETWINDOW_QPA_P_H #define QWIDGETWINDOW_QPA_P_H -#include <QtGui/qwindow_qpa.h> +#include <QtGui/qwindow.h> #include <QtCore/private/qobject_p.h> diff --git a/src/gui/kernel/qwindow_qpa.cpp b/src/gui/kernel/qwindow.cpp index baaec97eb1..17afd53300 100644 --- a/src/gui/kernel/qwindow_qpa.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include "qwindow_qpa.h" +#include "qwindow.h" #include "qplatformwindow_qpa.h" #include "qwindowformat_qpa.h" #include "qplatformglcontext_qpa.h" #include "qwindowcontext_qpa.h" -#include "qwindow_qpa_p.h" +#include "qwindow_p.h" #include "qapplication_p.h" #include <QtCore/QDebug> diff --git a/src/gui/kernel/qwindow_qpa.h b/src/gui/kernel/qwindow.h index f2fde2d532..f2fde2d532 100644 --- a/src/gui/kernel/qwindow_qpa.h +++ b/src/gui/kernel/qwindow.h diff --git a/src/gui/kernel/qwindow_qpa_p.h b/src/gui/kernel/qwindow_p.h index 1acc023e92..304ab3bc49 100644 --- a/src/gui/kernel/qwindow_qpa_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -42,7 +42,7 @@ #ifndef QWINDOW_QPA_P_H #define QWINDOW_QPA_P_H -#include <QtGui/qwindow_qpa.h> +#include <QtGui/qwindow.h> #include <QtCore/private/qobject_p.h> diff --git a/src/gui/kernel/qwindowcontext_qpa.cpp b/src/gui/kernel/qwindowcontext_qpa.cpp index fc97c5276d..f121e846b2 100644 --- a/src/gui/kernel/qwindowcontext_qpa.cpp +++ b/src/gui/kernel/qwindowcontext_qpa.cpp @@ -41,7 +41,7 @@ #include "qplatformglcontext_qpa.h" #include "qwindowcontext_qpa.h" -#include "qwindow_qpa.h" +#include "qwindow.h" #include <QtCore/QThreadStorage> #include <QtCore/QThread> diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp index fe97d4a2f2..c8659a1fac 100644 --- a/src/gui/painting/qwindowsurface.cpp +++ b/src/gui/painting/qwindowsurface.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <private/qwindowsurface_p.h> -#include <qwindow_qpa.h> -#include <private/qwindow_qpa_p.h> +#include <qwindow.h> +#include <private/qwindow_p.h> #include <private/qapplication_p.h> QT_BEGIN_NAMESPACE diff --git a/src/gui/painting/qwindowsurface_p.h b/src/gui/painting/qwindowsurface_p.h index 9d3e95e1ca..835aae77d4 100644 --- a/src/gui/painting/qwindowsurface_p.h +++ b/src/gui/painting/qwindowsurface_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qwindow_qpa.h> +#include <QtGui/qwindow.h> QT_BEGIN_NAMESPACE |