QPlatformWindowFormat -> QWindowFormat fixes.

(cherry picked from commit 4c2eba33ca0433386fa1273fb1bc14adb852d9ac)

diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index 03313aa..f1a34a7 100644 (file)
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -220,7 +220,7 @@ qpa {
                 kernel/qplatformintegrationfactory_qpa_p.h \
                 kernel/qplatformintegrationplugin_qpa.h \
                 kernel/qplatformwindow_qpa.h \
-                kernel/qplatformwindowformat_qpa.h \
+                kernel/qwindowformat_qpa.h \
                 kernel/qplatformglcontext_qpa.h \
                 kernel/qdesktopwidget_qpa_p.h \
                 kernel/qplatformeventloopintegration_qpa.h \
@@ -246,7 +246,7 @@ qpa {
                 kernel/qplatformintegrationfactory_qpa.cpp \
                 kernel/qplatformintegrationplugin_qpa.cpp \
                 kernel/qplatformwindow_qpa.cpp \
-                kernel/qplatformwindowformat_qpa.cpp \
+                kernel/qwindowformat_qpa.cpp \
                 kernel/qplatformeventloopintegration_qpa.cpp \
                 kernel/qplatformglcontext_qpa.cpp \
                 kernel/qplatformcursor_qpa.cpp \

diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index 7d4726e..fe21fb8 100644 (file)
--- 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/qplatformwindowformat_qpa.h>
+#include <QtGui/qwindowformat_qpa.h>
 #endif
 
 #ifdef QT_INCLUDE_COMPAT

diff --git a/src/gui/kernel/qwindowformat_qpa.cpp b/src/gui/kernel/qwindowformat_qpa.cpp
index c165c85..4cc1f77 100644 (file)
--- a/src/gui/kernel/qwindowformat_qpa.cpp
+++ b/src/gui/kernel/qwindowformat_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformwindowformat_qpa.h"
+#include "qwindowformat_qpa.h"
 
 #include <QtCore/QDebug>