summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@nokia.com>2010-08-20 15:52:36 (GMT)
committerPierre Rossi <pierre.rossi@nokia.com>2010-08-31 14:51:25 (GMT)
commit19198b08a1d5b6f4e6875d93e2647b38e8f11184 (patch)
treeffa9975424aa9f7e198346dce9792093b22dc495 /examples
parent0b438841e98add45fbddce51e210aea0c97a1f91 (diff)
downloadQt-19198b08a1d5b6f4e6875d93e2647b38e8f11184.zip
Qt-19198b08a1d5b6f4e6875d93e2647b38e8f11184.tar.gz
Qt-19198b08a1d5b6f4e6875d93e2647b38e8f11184.tar.bz2
Some small Solaris fixes.
Sets the arch properly for solaris-cc-64-stlport on x86_64. This patch also removes three redundant lines in configure and disables qtconcurrent examples when it's not available. Reviewed-by: Thiago
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 7d9aa05..4408a8b 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -13,7 +13,6 @@ SUBDIRS = \
mainwindows \
network \
painting \
- qtconcurrent \
richtext \
sql \
statemachine \
@@ -61,6 +60,7 @@ contains(QT_CONFIG, dbus): SUBDIRS += dbus
win32: SUBDIRS += activeqt
contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns
contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows
+contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent
# install
sources.files = README *.pro