summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-09-07 11:30:11 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-09-07 11:30:11 (GMT)
commit2b6dd2c7b44e37e79b1ae929a761c17929a2e569 (patch)
tree30f3c55312be601d29c0acbc318db75d7d06b188 /examples
parent98a4db7321cb286cd0a7a07adeb265798a650515 (diff)
parent2735bc6759f881c786a1097580a8682e3d28f365 (diff)
downloadQt-2b6dd2c7b44e37e79b1ae929a761c17929a2e569.zip
Qt-2b6dd2c7b44e37e79b1ae929a761c17929a2e569.tar.gz
Qt-2b6dd2c7b44e37e79b1ae929a761c17929a2e569.tar.bz2
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
Conflicts: qmake/Makefile.win32 src/corelib/io/qfsfileengine_win.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/gui/dialogs/qfiledialog_win.cpp src/gui/inputmethod/qcoefepinputcontext_s60.cpp src/gui/text/qfontdatabase_win.cpp src/gui/util/qsystemtrayicon_win.cpp src/script/utils/qscriptdate.cpp tests/auto/qinputcontext/tst_qinputcontext.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp
Diffstat (limited to 'examples')
-rw-r--r--examples/examples.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index 1fdd774..f233aba 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -19,7 +19,6 @@ SUBDIRS = \
linguist \
mainwindows \
painting \
- qtconcurrent \
richtext \
sql \
tools \
@@ -67,6 +66,7 @@ contains(QT_CONFIG, declarative): SUBDIRS += declarative
win32: SUBDIRS += activeqt
contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns
contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
+contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent
# install
sources.files = README *.pro