Merge commit 'qt/master-stable'

Conflicts:
	config.tests/unix/openssl/openssl.pri
	demos/embedded/embedded.pro
	examples/itemviews/chart/chart.pro
	examples/network/network.pro
	examples/painting/painterpaths/painterpaths.pro
	examples/threads/mandelbrot/mandelbrot.pro
	qmake/project.cpp
	src/3rdparty/libtiff/libtiff/tif_config.h
	src/corelib/arch/arch.pri
	src/corelib/global/qglobal.cpp
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcore_unix_p.h
	src/corelib/kernel/qobject.cpp
	src/corelib/thread/qthread_unix.cpp
	src/corelib/tools/qsharedpointer_impl.h
	src/corelib/tools/tools.pri
	src/gui/kernel/qaction.h
	src/gui/kernel/qapplication.cpp
	src/gui/painting/qregion.h
	src/gui/widgets/qlineedit.cpp
	src/gui/widgets/qlineedit_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qdiriterator/tst_qdiriterator.cpp
	tests/auto/qhttp/qhttp.pro
	tests/auto/qline/qline.pro
	tests/auto/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/qresourceengine/qresourceengine.pro
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qstring/qstring.pro
	tests/auto/qtcpsocket/qtcpsocket.pro
	tests/auto/qtcpsocket/tst_qtcpsocket.cpp

4 files changed, 7 insertions, 4 deletions

diff --git a/demos/embedded/embedded.pro b/demos/embedded/embedded.pro
index 25904ef6eb..469e5432d6 100644
--- a/demos/embedded/embedded.pro
+++ b/demos/embedded/embedded.pro
@@ -3,8 +3,8 @@ SUBDIRS   = styledemo
 
 contains(QT_CONFIG, svg) {
     SUBDIRS += embeddedsvgviewer \
-               fluidlauncher \
                desktopservices
+    !vxworks:!qnx:SUBDIRS += fluidlauncher
 }
 
 contains(QT_CONFIG, webkit) {
diff --git a/demos/qtdemo/xml/examples.xml b/demos/qtdemo/xml/examples.xml
index a81eead660..006bfd07e2 100644
--- a/demos/qtdemo/xml/examples.xml
+++ b/demos/qtdemo/xml/examples.xml
@@ -246,5 +246,6 @@
     <example filename="qobjectxmlmodel" name="QObjectXmlModel" />
     <example filename="filetree" name="File Tree" />
     <example filename="trafficinfo" name="Traffic Info" />
+    <example filename="schema" name="XML Schema Validation" />
   </category>  
 </categories>
diff --git a/demos/sub-attaq/custompropertyanimation.cpp b/demos/sub-attaq/custompropertyanimation.cpp
index 9282f4202e..27a4eba6b0 100644
--- a/demos/sub-attaq/custompropertyanimation.cpp
+++ b/demos/sub-attaq/custompropertyanimation.cpp
@@ -96,7 +96,7 @@ void CustomPropertyAnimation::updateState(QAbstractAnimation::State oldState, QA
             setKeyValues(values);
         }
 
-        if (animProp && !startValue().isValid() && currentTime() == 0
+        if ((animProp && !startValue().isValid() && currentTime() == 0)
             || (currentTime() == duration() && currentLoop() == (loopCount() - 1))) {
                 setStartValue(def);
         }
diff --git a/demos/sub-attaq/states.cpp b/demos/sub-attaq/states.cpp
index d63737f52f..d6c0b5a1db 100644
--- a/demos/sub-attaq/states.cpp
+++ b/demos/sub-attaq/states.cpp
@@ -269,9 +269,10 @@ void UpdateScoreState::onEntry(QEvent *e)
 
 /** Win transition */
 UpdateScoreTransition::UpdateScoreTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target)
-    : QSignalTransition(scene,SIGNAL(subMarineDestroyed(int)), QList<QAbstractState*>() << target),
+    : QSignalTransition(scene,SIGNAL(subMarineDestroyed(int))),
     game(game), scene(scene)
 {
+    setTargetState(target);
 }
 
 bool UpdateScoreTransition::eventTest(QEvent *event)
@@ -288,9 +289,10 @@ bool UpdateScoreTransition::eventTest(QEvent *event)
 
 /** Win transition */
 WinTransition::WinTransition(GraphicsScene *scene, PlayState *game, QAbstractState *target)
-    : QSignalTransition(scene,SIGNAL(allSubMarineDestroyed(int)), QList<QAbstractState*>() << target),
+    : QSignalTransition(scene,SIGNAL(allSubMarineDestroyed(int))),
     game(game), scene(scene)
 {
+    setTargetState(target);
 }
 
 bool WinTransition::eventTest(QEvent *event)