Merge commit 'qt/master'

Conflicts:
	doc/src/examples.qdoc
	doc/src/plugins-howto.qdoc
	doc/src/topics.qdoc
	examples/phonon/musicplayer/mainwindow.cpp
	src/3rdparty/freetype/src/base/ftobjs.c
	src/corelib/global/qglobal.h
	src/corelib/tools/qalgorithms.h
	src/corelib/tools/qshareddata.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/corelib/tools/tools.pri
	src/corelib/xml/qxmlstream.h
	src/gui/painting/painting.pri
	src/gui/widgets/qdatetimeedit.cpp
	tests/auto/qdesktopservices/qdesktopservices.pro
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tests/auto/qtextcodec/test/test.pro

1 files changed, 15 insertions, 7 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 8adf1b3..cc9f1b9 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -12,8 +12,6 @@ SUBDIRS += \
            compilerwarnings \
            exceptionsafety \
            linguist \
-           macgui \
-           macplist \
            mediaobject \
 #           mediaobject_wince_ds9 \   This is Windows CE only (we test the second phonon backend ds9 here)
            moc \
@@ -75,7 +73,6 @@ SUBDIRS += \
            qabstractspinbox \
            qabstracttextdocumentlayout \
            qaccessibility \
-           qaccessibility_mac \
            qaction \
            qactiongroup \
            qalgorithms \
@@ -98,7 +95,6 @@ SUBDIRS += \
            qcombobox \
            qcompleter \
            qcomplextext \
-           qcopchannel \
            qcoreapplication \
            qcryptographichash \
            qcssparser \
@@ -114,7 +110,6 @@ SUBDIRS += \
            qdialog \
            qdialogbuttonbox \
            qdir \
-           qdirectpainter \
            qdirmodel \
            qdockwidget \
            qdom \
@@ -209,7 +204,6 @@ SUBDIRS += \
            qmouseevent \
            qmouseevent_modal \
            qmovie \
-           qmultiscreen \
            qmutex \
            qmutexlocker \
            qnativesocketengine \
@@ -317,6 +311,7 @@ SUBDIRS += \
            qstatusbar \
            qstl \
            qstring \
+           qstringbuilder \
            qstringmatcher \
            qstringlist \
            qstringlistmodel \
@@ -349,7 +344,6 @@ SUBDIRS += \
            qtextlayout \
            qtextlist \
            qtextobject \
-           qtextpiecetable \
            qtextscriptengine \
            qtextstream \
            qtexttable \
@@ -404,6 +398,19 @@ SUBDIRS += \
            utf8
 
 contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
+mac: {
+    SUBDIRS += macgui \
+               macplist \
+               qaccessibility_mac
+}
+embedded: {
+    SUBDIRS += qcopchannel \
+               qdirectpainter \
+               qmultiscreen
+}
+!win32: {
+    SUBDIRS += qtextpiecetable
+}
 
 # Enable the tests specific to QtXmlPatterns. If you add a test, remember to
 # update runQtXmlPatternsTests.sh too. Remember that this file, auto.pro, is
@@ -445,6 +452,7 @@ SUBDIRS += checkxmlfiles                \
 xmlpatternsdiagnosticsts.depends = xmlpatternsxqts
 xmlpatternsview.depends = xmlpatternsxqts
 xmlpatternsxslts.depends = xmlpatternsxqts
+xmlpatternsschemats.depends = xmlpatternsxqts
 }
 
 unix:!embedded:contains(QT_CONFIG, dbus):SUBDIRS += \