Merge commit 'qt/master'

Conflicts:
	configure.exe
	examples/examples.pro
	qmake/Makefile.unix
	qmake/Makefile.win32
	qmake/Makefile.win32-g++
	qmake/Makefile.win32-g++-sh
	qmake/qmake.pro
	src/script/api/qscriptable.h
	src/script/api/qscriptclasspropertyiterator.h
	src/script/api/qscriptcontext.h
	src/script/api/qscriptengineagent.cpp
	src/script/api/qscriptstring.cpp
	src/script/api/qscriptstring.h
	src/script/api/qscriptvalueiterator.cpp
	src/script/api/qscriptvalueiterator.h
	src/script/qscriptclass.cpp
	src/script/qscriptcontext.cpp
	src/script/qscriptengine.cpp
	src/script/qscriptengine_p.cpp
	src/script/qscriptvalue.cpp
	src/script/qscriptvalue_p.h
	src/script/qscriptvalueimplfwd_p.h
	src/script/script.pro
	src/src.pro
	tests/auto/auto.pro
	tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp
	tools/configure/configureapp.cpp

1 files changed, 3 insertions, 0 deletions

diff --git a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp
index adb4f33..73049d5 100644
--- a/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp
+++ b/src/scripttools/debugging/qscriptdebuggerconsoleglobalobject.cpp
@@ -361,6 +361,7 @@ void QScriptDebuggerConsoleGlobalObject::warning(const QString &text,
                                                  int lineNumber, int columnNumber)
 {
     Q_D(QScriptDebuggerConsoleGlobalObject);
+    Q_ASSERT(d->messageHandler != 0);
     d->messageHandler->message(QtWarningMsg, text, fileName, lineNumber, columnNumber);
 }
 
@@ -369,6 +370,7 @@ void QScriptDebuggerConsoleGlobalObject::message(const QString &text,
                                                  int lineNumber, int columnNumber)
 {
     Q_D(QScriptDebuggerConsoleGlobalObject);
+    Q_ASSERT(d->messageHandler != 0);
     d->messageHandler->message(QtDebugMsg, text, fileName, lineNumber, columnNumber);
 }
 
@@ -377,6 +379,7 @@ void QScriptDebuggerConsoleGlobalObject::error(const QString &text,
                                                int lineNumber, int columnNumber)
 {
     Q_D(QScriptDebuggerConsoleGlobalObject);
+    Q_ASSERT(d->messageHandler != 0);
     d->messageHandler->message(QtCriticalMsg, text, fileName, lineNumber, columnNumber);
 }