diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-06-24 09:41:39 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-06-24 09:41:39 (GMT) |
| commit | 9716e12e0f5590ebc23ad9fb7ba75c6a3c5aadab (patch) | |
| tree | f1c6c06cc17f9f844b5e5083e917044949fbe3e2 /src/plugins | |
| parent | 4e27ff09ce4fae4b0af584e1dedb6fa189c6e3d8 (diff) | |
| download | Qt-9716e12e0f5590ebc23ad9fb7ba75c6a3c5aadab.zip Qt-9716e12e0f5590ebc23ad9fb7ba75c6a3c5aadab.tar.gz Qt-9716e12e0f5590ebc23ad9fb7ba75c6a3c5aadab.tar.bz2 | |
Adding -qpa configure switch
also renaming the embedded_lite qmake switch to be qpa
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/graphicssystems/graphicssystems.pro | 6 | ||||
| -rw-r--r-- | src/plugins/platforms/platforms.pro | 9 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 4 |
3 files changed, 6 insertions, 13 deletions
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 |