1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

examples: fixed compile with -no-widgets

Browse Source 
Disable a few examples depending on widgets which had previously been
missed.

Change-Id: Ic9c7cda94f690ee9d541c742997b7db9ace40fe0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
This commit is contained in:
Rohan McGovern 2012-07-26 16:29:13 +10:00 committed by Qt by Nokia
parent 9784dd8d06
commit 0feb264674
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/examples.pro
View File

@ -36,8 +36,8 @@ SUBDIRS = \
} }
wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded
contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):SUBDIRS += qtestlib contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):!contains(QT_CONFIG, no-widgets):SUBDIRS += qtestlib
contains(QT_CONFIG, opengl): SUBDIRS += opengl contains(QT_CONFIG, opengl):!contains(QT_CONFIG, no-widgets):SUBDIRS += opengl
contains(QT_CONFIG, dbus): SUBDIRS += dbus contains(QT_CONFIG, dbus): SUBDIRS += dbus
contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent

8
examples/qtconcurrent/qtconcurrent.pro
View File

@ -8,6 +8,14 @@ SUBDIRS = imagescaling \
SUBDIRS += progressdialog SUBDIRS += progressdialog
} }
contains(QT_CONFIG, no-widgets) {
SUBDIRS -= \
imagescaling \
progressdialog \
runfunction \
wordcount
}
# install # install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent
sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README