diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/examples.pro | 10 | ||||
| -rw-r--r-- | examples/mainwindows/mainwindows.pro | 4 | ||||
| -rw-r--r-- | examples/opengl/opengl.pro | 6 |
3 files changed, 6 insertions, 14 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 763ff4e17e..2e2f606e85 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,11 +1,10 @@ -Qt += widgets - TEMPLATE = subdirs SUBDIRS = \ network \ statemachine \ threads \ - xml + xml \ + qpa !contains(QT_CONFIG, no-gui) { SUBDIRS += \ @@ -30,9 +29,6 @@ SUBDIRS = \ touch \ gestures } - -qpa:SUBDIRS += qpa - wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded embedded:SUBDIRS += qws @@ -46,5 +42,3 @@ contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES] INSTALLS += sources - -QT += widgets diff --git a/examples/mainwindows/mainwindows.pro b/examples/mainwindows/mainwindows.pro index cf8f4b68c9..3b81180a00 100644 --- a/examples/mainwindows/mainwindows.pro +++ b/examples/mainwindows/mainwindows.pro @@ -6,8 +6,8 @@ SUBDIRS = application \ menus \ recentfiles \ sdi - -mac* && !qpa: SUBDIRS += macmainwindow +# ### fixme +# mac* && !qpa: SUBDIRS += macmainwindow # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index a5d5dbcfaf..5b20a62474 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -22,10 +22,8 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ textures } -qpa { - SUBDIRS += hellowindow - SUBDIRS += paintedwindow -} +SUBDIRS += hellowindow \ + paintedwindow # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl |