summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure5
-rw-r--r--examples/examples.pro2
2 files changed, 2 insertions, 5 deletions
diff --git a/configure b/configure
index eaae2d1..f3420c8 100755
--- a/configure
+++ b/configure
@@ -1388,9 +1388,6 @@ while [ "$#" -gt 0 ]; do
solaris-64)
PLATFORM=solaris-cc-64
;;
- solaris-64)
- PLATFORM=solaris-cc-64
- ;;
openunix-cc)
PLATFORM=unixware-cc
;;
@@ -2687,7 +2684,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
;;
i86pc)
case "$PLATFORM" in
- *-64)
+ *-64*)
if [ "$OPT_VERBOSE" = "yes" ]; then
echo " 64-bit AMD 80x86 (x86_64)"
fi
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