diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 01:58:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-01 01:58:46 (GMT) |
| commit | dac9e5dd5644d29d6a8dde752e7c594727f16661 (patch) | |
| tree | ffa9975424aa9f7e198346dce9792093b22dc495 | |
| parent | 0b438841e98add45fbddce51e210aea0c97a1f91 (diff) | |
| parent | 19198b08a1d5b6f4e6875d93e2647b38e8f11184 (diff) | |
| download | Qt-dac9e5dd5644d29d6a8dde752e7c594727f16661.zip Qt-dac9e5dd5644d29d6a8dde752e7c594727f16661.tar.gz Qt-dac9e5dd5644d29d6a8dde752e7c594727f16661.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Some small Solaris fixes.
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | examples/examples.pro | 2 |
2 files changed, 2 insertions, 5 deletions
@@ -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 |