QGuiApplication is not QPA specific

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

8 files changed, 11 insertions, 9 deletions

diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index e02230cb2b..8cd6249584 100644
--- a/src/gui/kernel/kernel.pri
+++ b/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
 
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 11f683c9b3..f1dc3e85a7 100644
--- a/src/gui/kernel/qapplication.h
+++ b/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
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 6ab1cc2e73..d401c2f988 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/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
diff --git a/src/gui/kernel/qguiapplication_qpa.cpp b/src/gui/kernel/qguiapplication.cpp
index aece38bd8c..2e2ca66f3e 100644
--- a/src/gui/kernel/qguiapplication_qpa.cpp
+++ b/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();
diff --git a/src/gui/kernel/qguiapplication_qpa.h b/src/gui/kernel/qguiapplication.h
index 707510717c..707510717c 100644
--- a/src/gui/kernel/qguiapplication_qpa.h
+++ b/src/gui/kernel/qguiapplication.h
diff --git a/src/gui/kernel/qguiapplication_qpa_p.h b/src/gui/kernel/qguiapplication_p.h
index 3a01b38e25..64e0cc1675 100644
--- a/src/gui/kernel/qguiapplication_qpa_p.h
+++ b/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>
 
diff --git a/src/gui/kernel/qsessionmanager_qpa.cpp b/src/gui/kernel/qsessionmanager_qpa.cpp
index ef532d7981..bd6fc62f31 100644
--- a/src/gui/kernel/qsessionmanager_qpa.cpp
+++ b/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
diff --git a/src/gui/kernel/qwindowcontext_qpa.cpp b/src/gui/kernel/qwindowcontext_qpa.cpp
index 3dd48704ce..fc97c5276d 100644
--- a/src/gui/kernel/qwindowcontext_qpa.cpp
+++ b/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>