Merge commit 'mainline/master' into kinetic-declarativeui

Conflicts:
	configure.exe
	src/gui/math3d/qmatrix4x4.cpp
	src/gui/math3d/qmatrix4x4.h
	tools/qdoc3/htmlgenerator.cpp

7 files changed, 11 insertions, 10 deletions

diff --git a/src/corelib/statemachine/qeventtransition_p.h b/src/corelib/statemachine/qeventtransition_p.h
index 600cec0..ab17ad3 100644
--- a/src/corelib/statemachine/qeventtransition_p.h
+++ b/src/corelib/statemachine/qeventtransition_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qabstracttransition_p.h"
+#include "private/qabstracttransition_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/statemachine/qhistorystate_p.h b/src/corelib/statemachine/qhistorystate_p.h
index 5aaa64c..875dac8 100644
--- a/src/corelib/statemachine/qhistorystate_p.h
+++ b/src/corelib/statemachine/qhistorystate_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qabstractstate_p.h"
+#include "private/qabstractstate_p.h"
 
 #include <QtCore/qlist.h>
 
diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h
index 339de63..aacb6fc 100644
--- a/src/corelib/statemachine/qsignaltransition_p.h
+++ b/src/corelib/statemachine/qsignaltransition_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qabstracttransition_p.h"
+#include "private/qabstracttransition_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index 5463059..ebb0b47 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -329,9 +329,10 @@ QSignalTransition *QState::addTransition(QObject *sender, const char *signal,
         qWarning("QState::addTransition: cannot add transition to null state");
         return 0;
     }
-    if (*signal && sender->metaObject()->indexOfSignal(signal+1) == -1) {
+    int offset = (*signal == '0'+QSIGNAL_CODE) ? 1 : 0;
+    if (sender->metaObject()->indexOfSignal(signal+offset) == -1) {
         qWarning("QState::addTransition: no such signal %s::%s",
-                 sender->metaObject()->className(), signal+1);
+                 sender->metaObject()->className(), signal+offset);
         return 0;
     }
     QSignalTransition *trans = new QSignalTransition(sender, signal, QList<QAbstractState*>() << target);
diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h
index 93744b9..eddd831 100644
--- a/src/corelib/statemachine/qstate_p.h
+++ b/src/corelib/statemachine/qstate_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "qabstractstate_p.h"
+#include "private/qabstractstate_p.h"
 
 #include <QtCore/qlist.h>
 #include <QtCore/qbytearray.h>
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index 84619d7..d5f6b76 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -92,7 +92,7 @@ QT_BEGIN_NAMESPACE
     QAbstractState) and transitions (descendants of
     QAbstractTransition) between those states; these states and
     transitions define a state graph. Once a state graph has been
-    built, the state machine can execute it. \l{QStateMachine}'s
+    built, the state machine can execute it. QStateMachine's
     execution algorithm is based on the \l{State Chart XML: State
     Machine Notation for Control Abstraction}{State Chart XML (SCXML)}
     algorithm. The framework's \l{The State Machine
@@ -1329,7 +1329,7 @@ void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transitio
         if (!ok) {
 #ifdef QSTATEMACHINE_DEBUG
             qDebug() << q << ": FAILED to add signal transition from" << transition->sourceState()
-                     << ": ( sender =" << sender << ", signal =" << (signal.mid(1))
+                     << ": ( sender =" << sender << ", signal =" << signal
                      << ", targets =" << transition->targetStates() << ')';
 #endif
             return;
@@ -1339,7 +1339,7 @@ void QStateMachinePrivate::registerSignalTransition(QSignalTransition *transitio
     QSignalTransitionPrivate::get(transition)->signalIndex = signalIndex;
 #ifdef QSTATEMACHINE_DEBUG
     qDebug() << q << ": added signal transition from" << transition->sourceState()
-             << ": ( sender =" << sender << ", signal =" << (signal.mid(1))
+             << ": ( sender =" << sender << ", signal =" << signal
              << ", targets =" << transition->targetStates() << ')';
 #endif
 }
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index 54953b4..24073ca 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -62,7 +62,7 @@
 #include <QtCore/qvector.h>
 
 #include "qstate.h"
-#include "qstate_p.h"
+#include "private/qstate_p.h"
 
 QT_BEGIN_NAMESPACE