Examples, plugins: Remove remains of qpa in profiles.

Change-Id: I0fc45c6c4df6d1f07472aec30b9e64b55db8e543
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint 2011-10-28 10:41:14 +02:00 committed by Qt by Nokia
parent d23c1a9323
commit 1cae2fdb86
4 changed files with 7 additions and 19 deletions

View File

@ -1,11 +1,10 @@
Qt += widgets
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = \ SUBDIRS = \
network \ network \
statemachine \ statemachine \
threads \ threads \
xml xml \
qpa
!contains(QT_CONFIG, no-gui) { !contains(QT_CONFIG, no-gui) {
SUBDIRS += \ SUBDIRS += \
@ -30,9 +29,6 @@ SUBDIRS = \
touch \ touch \
gestures gestures
} }
qpa:SUBDIRS += qpa
wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded
embedded:SUBDIRS += qws embedded:SUBDIRS += qws
@ -46,5 +42,3 @@ contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent
sources.files = README *.pro sources.files = README *.pro
sources.path = $$[QT_INSTALL_EXAMPLES] sources.path = $$[QT_INSTALL_EXAMPLES]
INSTALLS += sources INSTALLS += sources
QT += widgets

View File

@ -6,8 +6,8 @@ SUBDIRS = application \
menus \ menus \
recentfiles \ recentfiles \
sdi sdi
# ### fixme
mac* && !qpa: SUBDIRS += macmainwindow # mac* && !qpa: SUBDIRS += macmainwindow
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows

View File

@ -22,10 +22,8 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){
textures textures
} }
qpa { SUBDIRS += hellowindow \
SUBDIRS += hellowindow paintedwindow
SUBDIRS += paintedwindow
}
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl

View File

@ -10,8 +10,4 @@ unix:!symbian {
!symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible
symbian:SUBDIRS += s60 symbian:SUBDIRS += s60
qpa: { SUBDIRS += platforms platforminputcontexts printsupport
SUBDIRS += platforms
SUBDIRS += platforminputcontexts
SUBDIRS += printsupport
}