Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

1 files changed, 3 insertions, 2 deletions

diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp
index 40f4d6c..a316894 100644
--- a/src/scripttools/debugging/qscriptdebugger.cpp
+++ b/src/scripttools/debugging/qscriptdebugger.cpp
@@ -993,7 +993,8 @@ public:
             m_debugger->scriptsModel->addScript(scriptId, data);
 
             // ### could be slow, might want to do this in a separate thread
-            QString xml = qt_scriptToXml(data.contents(), data.baseLineNumber());
+//            Q_ASSERT_X(false, Q_FUNC_INFO, "implement me");
+            QString xml; // = qt_scriptToXml(data.contents(), data.baseLineNumber());
             QScriptXmlParser::Result extraInfo = QScriptXmlParser::parse(xml);
             m_debugger->scriptsModel->addExtraScriptInfo(
                 scriptId, extraInfo.functionsInfo, extraInfo.executableLineNumbers);
@@ -1018,7 +1019,7 @@ class SyncBreakpointsJob : public QScriptDebuggerCommandSchedulerJob
 public:
     SyncBreakpointsJob(QScriptDebuggerPrivate *debugger)
         : QScriptDebuggerCommandSchedulerJob(debugger),
-          m_debugger(debugger) {}
+          m_debugger(debugger), m_index(-1) {}
     void start()
     {
         QScriptDebuggerCommandSchedulerFrontend frontend(commandScheduler(), this);