From 25028e3b144a54435be437d452b65bfbd4f63309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 26 Apr 2011 10:36:31 +0200 Subject: [PATCH] QPlatformWindowFormat -> QWindowFormat fixes. (cherry picked from commit 4c2eba33ca0433386fa1273fb1bc14adb852d9ac) --- src/gui/kernel/kernel.pri | 4 ++-- src/gui/kernel/qwidget.h | 2 +- src/gui/kernel/qwindowformat_qpa.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index 03313aa434..f1a34a7de9 100644 --- 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 7d4726ed6d..fe21fb8608 100644 --- a/src/gui/kernel/qwidget.h +++ b/src/gui/kernel/qwidget.h @@ -57,7 +57,7 @@ #include #ifdef Q_WS_QPA //should this go somewhere else? -#include +#include #endif #ifdef QT_INCLUDE_COMPAT diff --git a/src/gui/kernel/qwindowformat_qpa.cpp b/src/gui/kernel/qwindowformat_qpa.cpp index c165c8513a..4cc1f77e58 100644 --- 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