QGuiApplication is not QPA specific

Rename files to reflect that QGuiApplication is
going to be used everywhere.

src/gui/image/qbitmap.cpp

@@ -44,7 +44,7 @@
 #include "qimage.h"
 #include "qvariant.h"
 #include <qpainter.h>
-#include <private/qguiapplication_qpa_p.h>
+#include <private/qguiapplication_p.h>
 
 QT_BEGIN_NAMESPACE
 

src/gui/image/qicon.cpp

@@ -54,6 +54,7 @@
 #include "qcache.h"
 #include "qdebug.h"
 #include "private/qguiplatformplugin_p.h"
+#include "qguiapplication.h"
 
 #ifdef Q_WS_MAC
 #include <private/qt_mac_p.h>

src/gui/image/qiconloader.cpp

@@ -41,7 +41,7 @@
 #ifndef QT_NO_ICON
 #include <private/qiconloader_p.h>
 
-#include <private/qguiapplication_qpa_p.h>
+#include <private/qguiapplication_p.h>
 #include <private/qicon_p.h>
 #include <private/qguiplatformplugin_p.h>
 
@@ -489,8 +489,8 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st
     if (basePixmap.isNull())
         basePixmap.load(filename);
 
+#if 0 // ### Qt5
     int actualSize = qMin(size.width(), size.height());
-
     QString key = QLatin1Literal("$qt_theme_")
                   % HexString<qint64>(basePixmap.cacheKey())
                   % HexString<int>(mode)
@@ -507,6 +507,9 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st
         QPixmapCache::insert(key, cachedPixmap);
     }
     return cachedPixmap;
+#else
+    return basePixmap;
+#endif
 }
 
 QPixmap ScalableEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state)

src/gui/image/qnativeimage.cpp

@@ -45,7 +45,7 @@
 
 #include "private/qpaintengine_raster_p.h"
 
-#include "private/qguiapplication_qpa_p.h"
+#include "private/qguiapplication_p.h"
 
 #if defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
 #include <qx11info_x11.h>

src/gui/image/qpicture.cpp

@@ -47,6 +47,7 @@
 #include <private/qfactoryloader_p.h>
 #include <private/qpaintengine_pic_p.h>
 #include <private/qfont_p.h>
+#include <qguiapplication.h>
 
 #include "qdatastream.h"
 #include "qfile.h"

src/gui/image/qpixmap.cpp

@@ -52,7 +52,7 @@
 #include "qpainter.h"
 #include "qdatastream.h"
 #include "qbuffer.h"
-#include <private/qguiapplication_qpa_p.h>
+#include <private/qguiapplication_p.h>
 #include <private/qwidget_p.h>
 #include "qevent.h"
 #include "qfile.h"

src/gui/image/qpixmap_blitter.cpp

@@ -44,7 +44,7 @@
 #include <qpainter.h>
 #include <qimage.h>
 
-#include <private/qguiapplication_qpa_p.h>
+#include <private/qguiapplication_p.h>
 #include <private/qblittable_p.h>
 
 #include <private/qdrawhelper_p.h>

src/gui/image/qpixmap_qpa.cpp

@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <qpixmap.h>
-#include <private/qguiapplication_qpa_p.h>
+#include <private/qguiapplication_p.h>
 
 QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h)
 {

src/gui/image/qpixmapdata.cpp

@@ -43,7 +43,7 @@
 #include <QtCore/qbuffer.h>
 #include <QtGui/qbitmap.h>
 #include <QtGui/qimagereader.h>
-#include <private/qguiapplication_qpa_p.h>
+#include <private/qguiapplication_p.h>
 #include <private/qimagepixmapcleanuphooks_p.h>
 
 QT_BEGIN_NAMESPACE

src/gui/image/qpixmapdatafactory.cpp

@@ -60,7 +60,7 @@
 # include <private/qpixmap_s60_p.h>
 #endif
 
-#include "private/qguiapplication_qpa_p.h"
+#include "private/qguiapplication_p.h"
 
 QT_BEGIN_NAMESPACE
 

src/gui/image/qpixmapfilter.cpp

@@ -48,7 +48,7 @@
 #include "qpixmapfilter_p.h"
 #include "qvarlengtharray.h"
 
-#include "private/qguiapplication_qpa_p.h"
+#include "private/qguiapplication_p.h"
 #include "private/qpaintengineex_p.h"
 #include "private/qpaintengine_raster_p.h"
 #include "qmath.h"

src/gui/kernel/kernel.pri

@@ -203,8 +203,8 @@ qpa {
                 kernel/qplatformclipboard_qpa.h \
                 kernel/qplatformnativeinterface_qpa.h \
                 kernel/qwindowformat_qpa.h \
-                kernel/qguiapplication_qpa.h \
-                kernel/qguiapplication_qpa_p.h \
+                kernel/qguiapplication.h \
+                kernel/qguiapplication_p.h \
                 kernel/qwidgetwindow_qpa_p.h \
                 kernel/qwindow_qpa_p.h \
                 kernel/qwindow_qpa.h
@@ -234,7 +234,7 @@ qpa {
                 kernel/qplatformnativeinterface_qpa.cpp \
                 kernel/qsessionmanager_qpa.cpp \
                 kernel/qwindowformat_qpa.cpp \
-                kernel/qguiapplication_qpa.cpp \
+                kernel/qguiapplication.cpp \
                 kernel/qwidgetwindow_qpa.cpp \
                 kernel/qwindow_qpa.cpp
 

src/gui/kernel/qapplication.h

@@ -59,7 +59,7 @@
 # include <QtGui/qtransportauth_qws.h>
 #endif
 #ifdef Q_WS_QPA
-# include <QtGui/qguiapplication_qpa.h>
+# include <QtGui/qguiapplication.h>
 #endif
 
 QT_BEGIN_HEADER

src/gui/kernel/qapplication_p.h

@@ -76,7 +76,7 @@
 #include <QWindowSystemInterface>
 #include "qwindowsysteminterface_qpa_p.h"
 #include "QtGui/qplatformintegration_qpa.h"
-#include "QtGui/private/qguiapplication_qpa_p.h"
+#include "QtGui/private/qguiapplication_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE

src/gui/kernel/qguiapplication.cpp

@@ -39,9 +39,9 @@
 **
 ****************************************************************************/
 
-#include "qguiapplication_qpa.h"
+#include "qguiapplication.h"
 
-#include "private/qguiapplication_qpa_p.h"
+#include "private/qguiapplication_p.h"
 #include "private/qplatformintegrationfactory_qpa_p.h"
 #include "private/qevent_p.h"
 
@@ -123,7 +123,7 @@ QGuiApplication::~QGuiApplication()
     // flush clipboard contents
     if (QGuiApplicationPrivate::qt_clipboard) {
         QEvent event(QEvent::Clipboard);
-        QApplication::sendEvent(QGuiApplicationPrivate::qt_clipboard, &event);
+        QGuiApplication::sendEvent(QGuiApplicationPrivate::qt_clipboard, &event);
     }
 
     d->eventDispatcher->closingDown();

src/gui/kernel/qguiapplication_p.h

@@ -42,7 +42,7 @@
 #ifndef QGUIAPPLICATION_QPA_P_H
 #define QGUIAPPLICATION_QPA_P_H
 
-#include <QtGui/qguiapplication_qpa.h>
+#include <QtGui/qguiapplication.h>
 
 #include <QtCore/private/qcoreapplication_p.h>
 

src/gui/kernel/qsessionmanager_qpa.cpp

@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <qsessionmanager.h>
+#include <qapplication.h>
 
 #include <private/qobject_p.h>
 #ifndef QT_NO_SESSIONMANAGER

src/gui/kernel/qwindowcontext_qpa.cpp

@@ -41,6 +41,7 @@
 
 #include "qplatformglcontext_qpa.h"
 #include "qwindowcontext_qpa.h"
+#include "qwindow_qpa.h"
 
 #include <QtCore/QThreadStorage>
 #include <QtCore/QThread>

src/gui/painting/qcolormap_qpa.cpp

@@ -42,7 +42,7 @@
 #include "qcolormap.h"
 #include "qcolor.h"
 #include "qpaintdevice.h"
-#include "private/qapplication_p.h"
+#include "private/qguiapplication_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -66,7 +66,7 @@ void QColormap::initialize()
 {
     screenMap = new QColormapPrivate;
 
-    QPlatformIntegration *pi = QApplicationPrivate::platformIntegration();
+    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
     QList<QPlatformScreen*> screens = pi->screens();
 
     screenMap->depth = screens.at(0)->depth();

src/gui/painting/qdrawutil.cpp

@@ -42,7 +42,6 @@
 #include "qdrawutil.h"
 #include "qbitmap.h"
 #include "qpixmapcache.h"
-#include "qapplication.h"
 #include "qpainter.h"
 #include "qpalette.h"
 #include <private/qpaintengineex_p.h>