41 files changed, 56 insertions, 56 deletions

diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
index 253c091..476f1a3 100644
--- a/src/gui/egl/egl.pri
+++ b/src/gui/egl/egl.pri
@@ -29,7 +29,7 @@ contains(QT_CONFIG, egl): {
 	        SOURCES += egl/qegl_qws.cpp
 	    } else {
 	        embedded_lite {
-	            SOURCES += egl/qegl_lite.cpp
+	            SOURCES += egl/qegl_qpa.cpp
 	        } else {
 	            symbian {
 	                SOURCES += egl/qegl_symbian.cpp
diff --git a/src/gui/egl/qegl_lite.cpp b/src/gui/egl/qegl_qpa.cpp
index 10caf46..10caf46 100644
--- a/src/gui/egl/qegl_lite.cpp
+++ b/src/gui/egl/qegl_qpa.cpp
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index 1df66a0..064ba32 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -64,7 +64,7 @@ embedded {
     SOURCES += image/qpixmap_qws.cpp
 }
 embedded_lite {
-    SOURCES += image/qpixmap_lite.cpp
+    SOURCES += image/qpixmap_qpa.cpp
 }
 x11 {
     HEADERS += image/qpixmap_x11_p.h
diff --git a/src/gui/image/qpixmap_lite.cpp b/src/gui/image/qpixmap_qpa.cpp
index 61be216..61be216 100644
--- a/src/gui/image/qpixmap_lite.cpp
+++ b/src/gui/image/qpixmap_qpa.cpp
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index f849ad7..dcdfd04 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -51,7 +51,7 @@ HEADERS += \
 	kernel/qsoftkeymanager_p.h \
     kernel/qsoftkeymanager_common_p.h \
 	kernel/qguiplatformplugin_p.h \
-        kernel/qdesktopwidget_lite_p.h
+        kernel/qdesktopwidget_qpa_p.h
 
 SOURCES += \
 	kernel/qaction.cpp \
@@ -200,41 +200,41 @@ embedded {
 
 embedded_lite {
 	HEADERS += \
-		kernel/qgenericpluginfactory_lite.h \
-                kernel/qgenericplugin_lite.h \
-                kernel/qeventdispatcher_lite_p.h \
+		kernel/qgenericpluginfactory_qpa.h \
+                kernel/qgenericplugin_qpa.h \
+                kernel/qeventdispatcher_qpa_p.h \
                 kernel/qwindowsysteminterface.h \
-                kernel/qplatformintegration_lite.h \
-                kernel/qplatformscreen_lite.h \
-                kernel/qplatformintegrationfactory_lite_p.h \
-                kernel/qplatformintegrationplugin_lite.h \
-                kernel/qplatformwindow_lite.h \
-                kernel/qplatformglcontext_lite.h
+                kernel/qplatformintegration_qpa.h \
+                kernel/qplatformscreen_qpa.h \
+                kernel/qplatformintegrationfactory_qpa_p.h \
+                kernel/qplatformintegrationplugin_qpa.h \
+                kernel/qplatformwindow_qpa.h \
+                kernel/qplatformglcontext_qpa.h
 		
 	SOURCES += \
-		kernel/qapplication_lite.cpp \
-		kernel/qclipboard_lite.cpp \
-		kernel/qcursor_lite.cpp \
+		kernel/qapplication_qpa.cpp \
+		kernel/qclipboard_qpa.cpp \
+		kernel/qcursor_qpa.cpp \
 		kernel/qdnd_qws.cpp \
-		kernel/qdesktopwidget_lite.cpp \
-		kernel/qgenericpluginfactory_lite.cpp \
-		kernel/qgenericplugin_lite.cpp \
+		kernel/qdesktopwidget_qpa.cpp \
+		kernel/qgenericpluginfactory_qpa.cpp \
+		kernel/qgenericplugin_qpa.cpp \
 		kernel/qkeymapper_qws.cpp \
-		kernel/qsound_lite.cpp \
-                kernel/qwidget_lite.cpp \
-                kernel/qeventdispatcher_lite.cpp \
+		kernel/qsound_qpa.cpp \
+                kernel/qwidget_qpa.cpp \
+                kernel/qeventdispatcher_qpa.cpp \
                 kernel/qwindowsysteminterface.cpp \
-                kernel/qplatformintegration_lite.cpp \
-                kernel/qplatformscreen_lite.cpp \
-                kernel/qplatformintegrationfactory_lite.cpp \
-                kernel/qplatformintegrationplugin_lite.cpp \
-                kernel/qplatformwindow_lite.cpp
+                kernel/qplatformintegration_qpa.cpp \
+                kernel/qplatformscreen_qpa.cpp \
+                kernel/qplatformintegrationfactory_qpa.cpp \
+                kernel/qplatformintegrationplugin_qpa.cpp \
+                kernel/qplatformwindow_qpa.cpp
 
         contains(QT_CONFIG, glib) {
             SOURCES += \
-		kernel/qeventdispatcher_glib_lite.cpp
+		kernel/qeventdispatcher_glib_qpa.cpp
             HEADERS += \
-                kernel/qeventdispatcher_glib_lite_p.h
+                kernel/qeventdispatcher_glib_qpa_p.h
             QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
             LIBS_PRIVATE +=$$QT_LIBS_GLIB
 	}
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index ecfac78..7d98f4d 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -78,7 +78,7 @@
 #endif
 #ifdef Q_WS_QPA
 #include <QWindowSystemInterface>
-#include "QtGui/qplatformintegration_lite.h"
+#include "QtGui/qplatformintegration_qpa.h"
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qapplication_lite.cpp b/src/gui/kernel/qapplication_qpa.cpp
index 9c36ef5..afa069b 100644
--- a/src/gui/kernel/qapplication_lite.cpp
+++ b/src/gui/kernel/qapplication_qpa.cpp
@@ -43,17 +43,17 @@
 #include "qcolormap.h"
 #include "qpixmapcache.h"
 #if !defined(QT_NO_GLIB)
-#include "qeventdispatcher_glib_lite_p.h"
+#include "qeventdispatcher_glib_qpa_p.h"
 #endif
-#include "qeventdispatcher_lite_p.h"
+#include "qeventdispatcher_qpa_p.h"
 #ifndef QT_NO_CURSOR
 #include "private/qcursor_p.h"
 #endif
 
 #include "private/qwidget_p.h"
 
-#include "qgenericpluginfactory_lite.h"
-#include "qplatformintegrationfactory_lite_p.h"
+#include "qgenericpluginfactory_qpa.h"
+#include "qplatformintegrationfactory_qpa_p.h"
 #include <qdesktopwidget.h>
 
 #include <qinputcontext.h>
@@ -62,7 +62,7 @@
 #include <QWindowSystemInterface>
 #include <QPlatformIntegration>
 
-#include "qdesktopwidget_lite_p.h"
+#include "qdesktopwidget_qpa_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qclipboard_lite.cpp b/src/gui/kernel/qclipboard_qpa.cpp
index 92b9e83..92b9e83 100644
--- a/src/gui/kernel/qclipboard_lite.cpp
+++ b/src/gui/kernel/qclipboard_qpa.cpp
diff --git a/src/gui/kernel/qcursor_lite.cpp b/src/gui/kernel/qcursor_qpa.cpp
index a6ae7d3..a6ae7d3 100644
--- a/src/gui/kernel/qcursor_lite.cpp
+++ b/src/gui/kernel/qcursor_qpa.cpp
diff --git a/src/gui/kernel/qdesktopwidget_lite.cpp b/src/gui/kernel/qdesktopwidget_qpa.cpp
index 6ba5dd9..cff05f5 100644
--- a/src/gui/kernel/qdesktopwidget_lite.cpp
+++ b/src/gui/kernel/qdesktopwidget_qpa.cpp
@@ -44,7 +44,7 @@
 #include "private/qgraphicssystem_p.h"
 #include <QWidget>
 #include "private/qwidget_p.h"
-#include "private/qdesktopwidget_lite_p.h"
+#include "private/qdesktopwidget_qpa_p.h"
 QT_BEGIN_NAMESPACE
 
 QT_USE_NAMESPACE
diff --git a/src/gui/kernel/qdesktopwidget_lite_p.h b/src/gui/kernel/qdesktopwidget_qpa_p.h
index 33e4c98..33e4c98 100644
--- a/src/gui/kernel/qdesktopwidget_lite_p.h
+++ b/src/gui/kernel/qdesktopwidget_qpa_p.h
diff --git a/src/gui/kernel/qeventdispatcher_glib_lite.cpp b/src/gui/kernel/qeventdispatcher_glib_qpa.cpp
index 744925c..f45902c 100644
--- a/src/gui/kernel/qeventdispatcher_glib_lite.cpp
+++ b/src/gui/kernel/qeventdispatcher_glib_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qeventdispatcher_glib_lite_p.h"
+#include "qeventdispatcher_glib_qpa_p.h"
 
 #include "qapplication.h"
 
diff --git a/src/gui/kernel/qeventdispatcher_glib_lite_p.h b/src/gui/kernel/qeventdispatcher_glib_qpa_p.h
index 6ebdb25..6ebdb25 100644
--- a/src/gui/kernel/qeventdispatcher_glib_lite_p.h
+++ b/src/gui/kernel/qeventdispatcher_glib_qpa_p.h
diff --git a/src/gui/kernel/qeventdispatcher_lite.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp
index 5b99a2f..c6b5636 100644
--- a/src/gui/kernel/qeventdispatcher_lite.cpp
+++ b/src/gui/kernel/qeventdispatcher_qpa.cpp
@@ -41,7 +41,7 @@
 
 #include "qplatformdefs.h"
 #include "qapplication.h"
-#include "qeventdispatcher_lite_p.h"
+#include "qeventdispatcher_qpa_p.h"
 #include "private/qeventdispatcher_unix_p.h"
 #include "qapplication_p.h"
 #ifndef QT_NO_THREAD
diff --git a/src/gui/kernel/qeventdispatcher_lite_p.h b/src/gui/kernel/qeventdispatcher_qpa_p.h
index c098e6c..c098e6c 100644
--- a/src/gui/kernel/qeventdispatcher_lite_p.h
+++ b/src/gui/kernel/qeventdispatcher_qpa_p.h
diff --git a/src/gui/kernel/qgenericplugin_lite.cpp b/src/gui/kernel/qgenericplugin_qpa.cpp
index 6a0fdb6..6290b40 100644
--- a/src/gui/kernel/qgenericplugin_lite.cpp
+++ b/src/gui/kernel/qgenericplugin_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qgenericplugin_lite.h"
+#include "qgenericplugin_qpa.h"
 
 #ifndef QT_NO_LIBRARY
 
diff --git a/src/gui/kernel/qgenericplugin_lite.h b/src/gui/kernel/qgenericplugin_qpa.h
index a468a9f..a468a9f 100644
--- a/src/gui/kernel/qgenericplugin_lite.h
+++ b/src/gui/kernel/qgenericplugin_qpa.h
diff --git a/src/gui/kernel/qgenericpluginfactory_lite.cpp b/src/gui/kernel/qgenericpluginfactory_qpa.cpp
index 76accbe..dcc7cc7 100644
--- a/src/gui/kernel/qgenericpluginfactory_lite.cpp
+++ b/src/gui/kernel/qgenericpluginfactory_qpa.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include "qgenericpluginfactory_lite.h"
+#include "qgenericpluginfactory_qpa.h"
 
 #include "qapplication.h"
 #include "private/qfactoryloader_p.h"
-#include "qgenericplugin_lite.h"
+#include "qgenericplugin_qpa.h"
 #include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/gui/kernel/qgenericpluginfactory_lite.h b/src/gui/kernel/qgenericpluginfactory_qpa.h
index 86886f1..86886f1 100644
--- a/src/gui/kernel/qgenericpluginfactory_lite.h
+++ b/src/gui/kernel/qgenericpluginfactory_qpa.h
diff --git a/src/gui/kernel/qplatformglcontext_lite.h b/src/gui/kernel/qplatformglcontext_qpa.h
index 8aeb635..8aeb635 100644
--- a/src/gui/kernel/qplatformglcontext_lite.h
+++ b/src/gui/kernel/qplatformglcontext_qpa.h
diff --git a/src/gui/kernel/qplatformintegration_lite.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp
index 6499570..8666911 100644
--- a/src/gui/kernel/qplatformintegration_lite.cpp
+++ b/src/gui/kernel/qplatformintegration_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformintegration_lite.h"
+#include "qplatformintegration_qpa.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatformintegration_lite.h b/src/gui/kernel/qplatformintegration_qpa.h
index 88c3049..f80b0ae 100644
--- a/src/gui/kernel/qplatformintegration_lite.h
+++ b/src/gui/kernel/qplatformintegration_qpa.h
@@ -43,7 +43,7 @@
 #define QPLATFORMINTEGRATION_H
 
 #include <QtGui/private/qgraphicssystem_p.h>
-#include <QtGui/qplatformscreen_lite.h>
+#include <QtGui/qplatformscreen_qpa.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/gui/kernel/qplatformintegrationfactory_lite.cpp b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp
index cd7d171..4f2bfa5 100644
--- a/src/gui/kernel/qplatformintegrationfactory_lite.cpp
+++ b/src/gui/kernel/qplatformintegrationfactory_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformintegrationfactory_lite_p.h"
+#include "qplatformintegrationfactory_qpa_p.h"
 #include <QPlatformIntegrationPlugin>
 #include "private/qfactoryloader_p.h"
 #include "qmutex.h"
diff --git a/src/gui/kernel/qplatformintegrationfactory_lite_p.h b/src/gui/kernel/qplatformintegrationfactory_qpa_p.h
index ba02d2c..ba02d2c 100644
--- a/src/gui/kernel/qplatformintegrationfactory_lite_p.h
+++ b/src/gui/kernel/qplatformintegrationfactory_qpa_p.h
diff --git a/src/gui/kernel/qplatformintegrationplugin_lite.cpp b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp
index cb1ed83..3bf2474 100644
--- a/src/gui/kernel/qplatformintegrationplugin_lite.cpp
+++ b/src/gui/kernel/qplatformintegrationplugin_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformintegrationplugin_lite.h"
+#include "qplatformintegrationplugin_qpa.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/kernel/qplatformintegrationplugin_lite.h b/src/gui/kernel/qplatformintegrationplugin_qpa.h
index 9c37cf7..9c37cf7 100644
--- a/src/gui/kernel/qplatformintegrationplugin_lite.h
+++ b/src/gui/kernel/qplatformintegrationplugin_qpa.h
diff --git a/src/gui/kernel/qplatformscreen_lite.cpp b/src/gui/kernel/qplatformscreen_qpa.cpp
index 4c0a02b..478d2d6 100644
--- a/src/gui/kernel/qplatformscreen_lite.cpp
+++ b/src/gui/kernel/qplatformscreen_qpa.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qplatformscreen_lite.h"
+#include "qplatformscreen_qpa.h"
 #include <QtGui/qapplication.h>
 #include <QtGui/qdesktopwidget.h>
 
diff --git a/src/gui/kernel/qplatformscreen_lite.h b/src/gui/kernel/qplatformscreen_qpa.h
index 7d0e28d..7d0e28d 100644
--- a/src/gui/kernel/qplatformscreen_lite.h
+++ b/src/gui/kernel/qplatformscreen_qpa.h
diff --git a/src/gui/kernel/qplatformwindow_lite.cpp b/src/gui/kernel/qplatformwindow_qpa.cpp
index 9efbf8b..c0e642c 100644
--- a/src/gui/kernel/qplatformwindow_lite.cpp
+++ b/src/gui/kernel/qplatformwindow_qpa.cpp
@@ -1,4 +1,4 @@
-#include "qplatformwindow_lite.h"
+#include "qplatformwindow_qpa.h"
 
 #include <QtGui/qwidget.h>
 
diff --git a/src/gui/kernel/qplatformwindow_lite.h b/src/gui/kernel/qplatformwindow_qpa.h
index 5f8d259..5f8d259 100644
--- a/src/gui/kernel/qplatformwindow_lite.h
+++ b/src/gui/kernel/qplatformwindow_qpa.h
diff --git a/src/gui/kernel/qsound_lite.cpp b/src/gui/kernel/qsound_qpa.cpp
index a4c74a8..0714185 100644
--- a/src/gui/kernel/qsound_lite.cpp
+++ b/src/gui/kernel/qsound_qpa.cpp
@@ -67,7 +67,7 @@ QAuServer* qt_new_audio_server()
     return new QAuServerLite(qApp);
 }
 
-#include "qsound_lite.moc"
+#include "qsound_qpa.moc"
 
 #endif // QT_NO_SOUND
 
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 57e3a31..53b35dd 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -76,7 +76,7 @@
 # include "private/qwindowsurface_qws_p.h"
 #endif
 #if defined(Q_WS_QPA)
-#include "qplatformwindow_lite.h"
+#include "qplatformwindow_qpa.h"
 #endif
 #include "qpainter.h"
 #include "qtooltip.h"
diff --git a/src/gui/kernel/qwidget_lite.cpp b/src/gui/kernel/qwidget_qpa.cpp
index f92eb61..11fa211 100644
--- a/src/gui/kernel/qwidget_lite.cpp
+++ b/src/gui/kernel/qwidget_qpa.cpp
@@ -47,7 +47,7 @@
 #include "QtGui/private/qgraphicssystem_p.h"
 #include "QtGui/private/qapplication_p.h"
 #include "QtGui/qdesktopwidget.h"
-#include "QtGui/qplatformwindow_lite.h"
+#include "QtGui/qplatformwindow_qpa.h"
 
 #include <QtGui/QGraphicsSystemCursor>
 
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 46be728..07017ec 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -189,11 +189,11 @@ embedded {
 
 embedded_lite {
         SOURCES += \
-                painting/qcolormap_lite.cpp \
-                painting/qpaintdevice_lite.cpp \
-                painting/qgraphicssystemcursor_lite.cpp
+                painting/qcolormap_qpa.cpp \
+                painting/qpaintdevice_qpa.cpp \
+                painting/qgraphicssystemcursor_qpa.cpp
         HEADERS += \
-                painting/qgraphicssystemcursor_lite.h
+                painting/qgraphicssystemcursor_qpa.h
 }
 
 symbian {
diff --git a/src/gui/painting/qcolormap_lite.cpp b/src/gui/painting/qcolormap_qpa.cpp
index 1f4fea8..1f4fea8 100644
--- a/src/gui/painting/qcolormap_lite.cpp
+++ b/src/gui/painting/qcolormap_qpa.cpp
diff --git a/src/gui/painting/qgraphicssystemcursor_lite.cpp b/src/gui/painting/qgraphicssystemcursor_qpa.cpp
index 752b406..24376f9 100644
--- a/src/gui/painting/qgraphicssystemcursor_lite.cpp
+++ b/src/gui/painting/qgraphicssystemcursor_qpa.cpp
@@ -38,7 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include "qgraphicssystemcursor_lite.h"
+#include "qgraphicssystemcursor_qpa.h"
 
 #include <QWidget>
 #include <QPainter>
diff --git a/src/gui/painting/qgraphicssystemcursor_lite.h b/src/gui/painting/qgraphicssystemcursor_qpa.h
index 9c65f7f..9c65f7f 100644
--- a/src/gui/painting/qgraphicssystemcursor_lite.h
+++ b/src/gui/painting/qgraphicssystemcursor_qpa.h
diff --git a/src/gui/painting/qpaintdevice_lite.cpp b/src/gui/painting/qpaintdevice_qpa.cpp
index 0d1ca92..0d1ca92 100644
--- a/src/gui/painting/qpaintdevice_lite.cpp
+++ b/src/gui/painting/qpaintdevice_qpa.cpp
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 3861196..e258a39 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -76,7 +76,7 @@
 #include <private/qt_s60_p.h>
 #endif
 #ifdef Q_WS_QPA
-#include <QtGui/qplatformscreen_lite.h>
+#include <QtGui/qplatformscreen_qpa.h>
 #include <QtGui/private/qapplication_p.h>
 #endif
 
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 97c12b3..f196e00 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -80,7 +80,7 @@ SOURCES	+= qgl.cpp \
 embedded_lite {
     DEFINES += QT_NO_EGL
 
-    SOURCES +=  qgl_lite.cpp \
+    SOURCES +=  qgl_qpa.cpp \
                 qglpixelbuffer_stub.cpp
 }
 
diff --git a/src/opengl/qgl_lite.cpp b/src/opengl/qgl_qpa.cpp
index 2003cc1..2003cc1 100644
--- a/src/opengl/qgl_lite.cpp
+++ b/src/opengl/qgl_qpa.cpp