Adding -qpa configure switch

also renaming the embedded_lite qmake switch to be qpa

19 files changed, 34 insertions, 41 deletions

diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index afb1bcd..9870769 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -49,7 +49,7 @@ TEMPLATE = lib
 TARGET = QtWebKit
 
 contains(QT_CONFIG, embedded):CONFIG += embedded
-contains(QT_CONFIG, embedded_lite):CONFIG += embedded
+contains(QT_CONFIG, qpa):CONFIG += embedded
 
 CONFIG(standalone_package) {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index 6f53a3f..1e27c31 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -78,7 +78,7 @@ wince*: {
 		kernel/qfunctions_wince.h
 }
 
-mac:!embedded:!embedded_lite {
+mac:!embedded:!qpa{
     SOURCES += \
         kernel/qcoreapplication_mac.cpp
 }
diff --git a/src/gui/accessible/accessible.pri b/src/gui/accessible/accessible.pri
index afa5ecd..31362ff 100644
--- a/src/gui/accessible/accessible.pri
+++ b/src/gui/accessible/accessible.pri
@@ -12,7 +12,7 @@ contains(QT_CONFIG, accessibility) {
 		 accessible/qaccessiblewidget.cpp \
 		 accessible/qaccessibleplugin.cpp
 
-      mac:!embedded:!embedded_lite {
+      mac:!embedded:!qpa {
         HEADERS += accessible/qaccessible_mac_p.h
         OBJECTIVE_SOURCES += accessible/qaccessible_mac.mm \
                              accessible/qaccessible_mac_cocoa.mm
diff --git a/src/gui/dialogs/dialogs.pri b/src/gui/dialogs/dialogs.pri
index 20bdabc..cd8e71a 100644
--- a/src/gui/dialogs/dialogs.pri
+++ b/src/gui/dialogs/dialogs.pri
@@ -27,7 +27,7 @@ HEADERS += \
 	dialogs/qwizard.h \
         dialogs/qprintpreviewdialog.h
 
-!embedded:!embedded_lite:mac {
+!embedded:!qpa:mac {
     OBJECTIVE_SOURCES += dialogs/qfiledialog_mac.mm \
                          dialogs/qfontdialog_mac.mm \
                          dialogs/qnspanelproxy_mac.mm \
@@ -61,7 +61,7 @@ win32 {
     !win32-borland:!wince*: LIBS += -lshell32 	# the filedialog needs this library
 }
 
-!mac:!embedded:!symbian:unix|embedded_lite {
+!mac:!embedded:!symbian:unix|qpa {
         HEADERS += dialogs/qpagesetupdialog_unix_p.h
 	SOURCES += dialogs/qprintdialog_unix.cpp \
 		   dialogs/qpagesetupdialog_unix.cpp
diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
index 476f1a3..8e8664c 100644
--- a/src/gui/egl/egl.pri
+++ b/src/gui/egl/egl.pri
@@ -28,7 +28,7 @@ contains(QT_CONFIG, egl): {
 	    embedded {
 	        SOURCES += egl/qegl_qws.cpp
 	    } else {
-	        embedded_lite {
+	        qpa {
 	            SOURCES += egl/qegl_qpa.cpp
 	        } else {
 	            symbian {
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 4fbdb36..772f70b 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -5,7 +5,7 @@ DEFINES   += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
 
-!win32:!embedded:!embedded_lite:!mac:!symbian:CONFIG      += x11
+!win32:!embedded:!qpa:!mac:!symbian:CONFIG      += x11
 
 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore
 
diff --git a/src/gui/image/image.pri b/src/gui/image/image.pri
index 064ba32..13447e7 100644
--- a/src/gui/image/image.pri
+++ b/src/gui/image/image.pri
@@ -63,14 +63,14 @@ win32 {
 embedded {
     SOURCES += image/qpixmap_qws.cpp
 }
-embedded_lite {
+qpa {
     SOURCES += image/qpixmap_qpa.cpp
 }
 x11 {
     HEADERS += image/qpixmap_x11_p.h
     SOURCES += image/qpixmap_x11.cpp 
 }
-!embedded:!embedded_lite:mac {
+!embedded:!qpa:mac {
     HEADERS += image/qpixmap_mac_p.h
     SOURCES += image/qpixmap_mac.cpp
 }
diff --git a/src/gui/inputmethod/inputmethod.pri b/src/gui/inputmethod/inputmethod.pri
index 6a3ef83..d439438 100644
--- a/src/gui/inputmethod/inputmethod.pri
+++ b/src/gui/inputmethod/inputmethod.pri
@@ -19,7 +19,7 @@ embedded {
     HEADERS += inputmethod/qwsinputcontext_p.h
     SOURCES += inputmethod/qwsinputcontext_qws.cpp
 }
-mac:!embedded:!embedded_lite {
+mac:!embedded:!qpa {
     HEADERS += inputmethod/qmacinputcontext_p.h
     SOURCES += inputmethod/qmacinputcontext_mac.cpp
 }
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index dcdfd04..5d92456 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -198,7 +198,7 @@ embedded {
 	}
 }
 
-embedded_lite {
+qpa {
 	HEADERS += \
 		kernel/qgenericpluginfactory_qpa.h \
                 kernel/qgenericplugin_qpa.h \
@@ -240,7 +240,7 @@ embedded_lite {
 	}
 }
 
-!embedded:!embedded_lite:!x11:mac {
+!embedded:!qpa:!x11:mac {
 	SOURCES += \
 		kernel/qclipboard_mac.cpp \
 		kernel/qmime_mac.cpp \
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 07017ec..8d9b09e 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -119,7 +119,7 @@ embedded {
     SOURCES += \
         painting/qgraphicssystem_qws.cpp \
 
-} else: if(!embedded_lite) {
+} else: if(!qpa) {
     HEADERS += \
         painting/qgraphicssystem_raster_p.h \
         painting/qgraphicssystem_runtime_p.h \
@@ -147,7 +147,7 @@ unix:x11 {
                 painting/qpaintengine_x11.cpp
 }
 
-!embedded:!embedded_lite:!x11:mac {
+!embedded:!qpa:!x11:mac {
         HEADERS += \
                 painting/qpaintengine_mac_p.h \
                 painting/qgraphicssystem_mac_p.h \
@@ -163,14 +163,14 @@ unix:x11 {
                 painting/qprintengine_mac.mm \
 }
 
-unix:!mac:!symbian|embedded_lite {
+unix:!mac:!symbian|qpa {
         HEADERS += \
                 painting/qprinterinfo_unix_p.h
         SOURCES += \
                 painting/qprinterinfo_unix.cpp
 }
 
-win32|x11|mac|embedded|embedded_lite|symbian {
+win32|x11|mac|embedded|qpa|symbian {
         SOURCES += painting/qbackingstore.cpp
         HEADERS += painting/qbackingstore_p.h
 }
@@ -187,7 +187,7 @@ embedded {
                 painting/qpaintdevice_qws.cpp
 }
 
-embedded_lite {
+qpa {
         SOURCES += \
                 painting/qcolormap_qpa.cpp \
                 painting/qpaintdevice_qpa.cpp \
@@ -206,7 +206,7 @@ symbian {
                 painting/qpaintengine_s60_p.h
 }
 
-x11|embedded|embedded_lite {
+x11|embedded|qpa {
         contains(QT_CONFIG,qtopia) {
             DEFINES += QT_NO_CUPS QT_NO_LPR
         } else {
@@ -372,7 +372,7 @@ x11 {
         SOURCES += painting/qwindowsurface_x11.cpp
 }
 
-!embedded:!embedded_lite:mac {
+!embedded:!qpa:mac {
         HEADERS += painting/qwindowsurface_mac_p.h
         SOURCES += painting/qwindowsurface_mac.cpp
 }
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri
index 9d6b6fb..0bac0aa 100644
--- a/src/gui/styles/styles.pri
+++ b/src/gui/styles/styles.pri
@@ -35,7 +35,7 @@ contains( styles, all ) {
 	styles = mac windows windowsxp windowsvista
 }
 
-x11|embedded|embedded_lite|!macx-*:styles -= mac
+x11|embedded|qpa|!macx-*:styles -= mac
 
 x11{
     QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index d7bddf5..04ab7df 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -89,7 +89,7 @@ unix:x11 {
 		text/qfontengine_ft.cpp
 }
 
-!embedded:!embedded_lite:!x11:mac {
+!embedded:!qpa:!x11:mac {
 	SOURCES += \
 		text/qfont_mac.cpp
         OBJECTIVE_SOURCES += text/qfontengine_mac.mm
@@ -110,7 +110,7 @@ embedded {
 	DEFINES += QT_NO_FONTCONFIG
 }
 
-embedded_lite {
+qpa {
 	SOURCES += \
 		text/qfont_qws.cpp \
 		text/qfontengine_ft.cpp \
diff --git a/src/gui/util/util.pri b/src/gui/util/util.pri
index dd99aa8..f66f9ff 100644
--- a/src/gui/util/util.pri
+++ b/src/gui/util/util.pri
@@ -33,12 +33,12 @@ unix:x11 {
 				util/qsystemtrayicon_x11.cpp
 }
 
-embedded|embedded_lite {
+embedded|qpa {
 		SOURCES += \
 				util/qsystemtrayicon_qws.cpp
 }
 
-!embedded:!embedded_lite:!x11:mac {
+!embedded:!qpa:!x11:mac {
 		OBJECTIVE_SOURCES += util/qsystemtrayicon_mac.mm
 }
 
diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri
index 9fe2b3d..669b838 100644
--- a/src/gui/widgets/widgets.pri
+++ b/src/gui/widgets/widgets.pri
@@ -144,7 +144,7 @@ SOURCES += \
         widgets/qplaintextedit.cpp \
         widgets/qprintpreviewwidget.cpp
 
-!embedded:!embedded_lite:mac {
+!embedded:!qpa:mac {
     HEADERS += widgets/qmacnativewidget_mac.h \
                widgets/qmaccocoaviewcontainer_mac.h
     OBJECTIVE_HEADERS += widgets/qcocoatoolbardelegate_mac_p.h \ 
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index f196e00..09a6b0f 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -11,7 +11,7 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
 
 include(../qbase.pri)
 
-!win32:!embedded:!mac:!embedded_lite:CONFIG	   += x11
+!win32:!embedded:!mac:!qpa:CONFIG	   += x11
 contains(QT_CONFIG, opengl):CONFIG += opengl
 contains(QT_CONFIG, opengles1):CONFIG += opengles1
 contains(QT_CONFIG, opengles2):CONFIG += opengles2
@@ -77,7 +77,7 @@ SOURCES	+= qgl.cpp \
 
 }
 
-embedded_lite {
+qpa {
     DEFINES += QT_NO_EGL
 
     SOURCES +=  qgl_qpa.cpp \
diff --git a/src/plugins/graphicssystems/graphicssystems.pro b/src/plugins/graphicssystems/graphicssystems.pro
index c00c9ff..7a8f4d6 100644
--- a/src/plugins/graphicssystems/graphicssystems.pro
+++ b/src/plugins/graphicssystems/graphicssystems.pro
@@ -2,11 +2,7 @@ TEMPLATE = subdirs
 SUBDIRS += trace
 !wince*:contains(QT_CONFIG, opengl):SUBDIRS += opengl
 contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl) {
-    embedded_lite {
-        SUBDIRS += openvglite
-    } else {
-        SUBDIRS += openvg
-    }
+    SUBDIRS += openvg
 }
 
 contains(QT_CONFIG, shivavg) {
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index 9688443..b68230c 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -1,14 +1,11 @@
 TEMPLATE = subdirs
 contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl) {
-    embedded_lite {
-        SUBDIRS += openvglite
-    } 
+    SUBDIRS += openvglite
 }
 
-embedded_lite {
     SUBDIRS += minimal
-}
 
-embedded_lite:x11 {
+#this don't work. but leave it for now
+qpa:x11 {
     SUBDIRS += testlite
 }
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 04e8c7c..bc76a0c 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -7,12 +7,12 @@ unix:!symbian {
         SUBDIRS *= codecs
 }
 !contains(QT_CONFIG, no-gui): SUBDIRS *= imageformats iconengines
-!embedded:!embedded_lite:SUBDIRS *= graphicssystems
+!embedded:!qpa:SUBDIRS *= graphicssystems
 embedded:SUBDIRS *=  gfxdrivers decorations mousedrivers kbddrivers
 !win32:!embedded:!mac:!symbian:SUBDIRS *= inputmethods
 !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible
 symbian:SUBDIRS += s60
 contains(QT_CONFIG, phonon): SUBDIRS *= phonon
 contains(QT_CONFIG, multimedia): SUBDIRS *= audio
-
+qpa:SUBDIRS += platforms
 
diff --git a/src/qt_install.pri b/src/qt_install.pri
index 3cea79c..268bb86 100644
--- a/src/qt_install.pri
+++ b/src/qt_install.pri
@@ -38,7 +38,7 @@ qt_install_headers {
     }
 }
 
-embedded|embedded_lite: equals(TARGET, QtGui) {
+embedded|qpa: equals(TARGET, QtGui) {
     # install fonts for embedded
     INSTALLS += fonts
     fonts.path = $$[QT_INSTALL_LIBS]/fonts