Fixing merge conflicts.

Merge branch '4.7-upstream' into 4.7

Conflicts:
	doc/src/declarative/advtutorial.qdoc
	src/declarative/graphicsitems/qdeclarativeloader.cpp
	src/declarative/graphicsitems/qdeclarativetextedit.cpp
	src/declarative/qml/qdeclarativeengine.cpp
	src/declarative/util/qdeclarativexmllistmodel.cpp

1 files changed, 6 insertions, 0 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index e86efb2..c3e0808 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -495,6 +495,8 @@ void QSelectThread::requestSocketEvents ( QSocketNotifier *notifier, TRequestSta
         start();
     }
 
+    Q_ASSERT(QThread::currentThread() == this->thread());
+
     QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex);
 
     Q_ASSERT(!m_AOStatuses.contains(notifier));
@@ -506,6 +508,8 @@ void QSelectThread::requestSocketEvents ( QSocketNotifier *notifier, TRequestSta
 
 void QSelectThread::cancelSocketEvents ( QSocketNotifier *notifier )
 {
+    Q_ASSERT(QThread::currentThread() == this->thread());
+
     QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex);
 
     m_AOStatuses.remove(notifier);
@@ -515,6 +519,8 @@ void QSelectThread::cancelSocketEvents ( QSocketNotifier *notifier )
 
 void QSelectThread::restart()
 {
+    Q_ASSERT(QThread::currentThread() == this->thread());
+
     QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex);
 
     m_waitCond.wakeAll();