Merge commit 'origin/1.3'

27 files changed, 381 insertions, 166 deletions

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 32a786e050..4b12f1deea 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1146,10 +1146,12 @@ IEditor *EditorManager::openEditor(Core::Internal::EditorView *view, const QStri
         return 0;
     }
     addEditor(editor);
-    restoreEditorState(editor);
-    QApplication::restoreOverrideCursor();
 
-    return activateEditor(view, editor, flags);
+    IEditor *result= activateEditor(view, editor, flags);
+    if (editor == result)
+        restoreEditorState(editor);
+    QApplication::restoreOverrideCursor();
+    return result;
 }
 
 bool EditorManager::openExternalEditor(const QString &fileName, const QString &editorKind)
diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp
index b03e4ca346..d048f6dee9 100644
--- a/src/plugins/cppeditor/cppeditor.cpp
+++ b/src/plugins/cppeditor/cppeditor.cpp
@@ -195,12 +195,10 @@ public:
 
     // local and external uses.
     SemanticInfo::LocalUseMap localUses;
-    SemanticInfo::ExternalUseMap externalUses;
 
     void operator()(FunctionDefinitionAST *ast)
     {
         localUses.clear();
-        externalUses.clear();
 
         if (ast && ast->symbol) {
             _functionScope = ast->symbol->members();
@@ -232,6 +230,18 @@ protected:
         return false;
     }
 
+    void searchUsesInTemplateArguments(NameAST *name)
+    {
+        if (! name)
+            return;
+
+        else if (TemplateIdAST *template_id = name->asTemplateId()) {
+            for (TemplateArgumentListAST *it = template_id->template_arguments; it; it = it->next) {
+                accept(it->template_argument);
+            }
+        }
+    }
+
     virtual bool visit(SimpleNameAST *ast)
     {
         unsigned line, column;
@@ -258,14 +268,14 @@ protected:
             scope = scope->enclosingScope();
         }
 
-        Identifier *id = identifier(ast->identifier_token);
-        externalUses[id].append(SemanticInfo::Use(line, column, id->size()));
-
         return false;
     }
 
     virtual bool visit(TemplateIdAST *ast)
     {
+        for (TemplateArgumentListAST *arg = ast->template_arguments; arg; arg = arg->next)
+            accept(arg->template_argument);
+
         unsigned line, column;
         getTokenStartPosition(ast->firstToken(), &line, &column);
 
@@ -290,34 +300,15 @@ protected:
             scope = scope->enclosingScope();
         }
 
-        Identifier *id = identifier(ast->identifier_token);
-        externalUses[id].append(SemanticInfo::Use(line, column, id->size()));
-
-        for (TemplateArgumentListAST *arg = ast->template_arguments; arg; arg = arg->next)
-            accept(arg);
-
         return false;
     }
 
     virtual bool visit(QualifiedNameAST *ast)
     {
-        if (! ast->global_scope_token) {
-            if (ast->nested_name_specifier) {
-                accept(ast->nested_name_specifier->class_or_namespace_name);
-
-                for (NestedNameSpecifierAST *it = ast->nested_name_specifier->next; it; it = it->next) {
-                    if (NameAST *class_or_namespace_name = it->class_or_namespace_name) {
-                        if (TemplateIdAST *template_id = class_or_namespace_name->asTemplateId()) {
-                            for (TemplateArgumentListAST *arg = template_id->template_arguments; arg; arg = arg->next)
-                                accept(arg);
-                        }
-                    }
-                }
-            }
-
-            accept(ast->unqualified_name);
-        }
+        for (NestedNameSpecifierAST *it = ast->nested_name_specifier; it; it = it->next)
+            searchUsesInTemplateArguments(it->class_or_namespace_name);
 
+        searchUsesInTemplateArguments(ast->unqualified_name);
         return false;
     }
 
@@ -878,6 +869,16 @@ void CPPEditor::findUsages()
 
 void CPPEditor::renameUsages()
 {
+    Core::EditorManager::instance()->showEditorInfoBar(QLatin1String("CppEditor.Rename"),
+                                                       tr("This change cannot be undone."),
+                                                       tr("Yes, I know what I am doing."),
+                                                       this, SLOT(renameUsagesNow()));
+}
+
+void CPPEditor::renameUsagesNow()
+{
+    Core::EditorManager::instance()->hideEditorInfoBar(QLatin1String("CppEditor.Rename"));
+
     m_currentRenameSelection = -1;
 
     QList<QTextEdit::ExtraSelection> selections;
@@ -2111,7 +2112,6 @@ SemanticInfo SemanticHighlighter::semanticInfo(const Source &source)
     semanticInfo.snapshot = snapshot;
     semanticInfo.doc = doc;
     semanticInfo.localUses = useTable.localUses;
-    semanticInfo.externalUses = useTable.externalUses;
 
     return semanticInfo;
 }
diff --git a/src/plugins/cppeditor/cppeditor.h b/src/plugins/cppeditor/cppeditor.h
index 6c853672bf..b15e7d7555 100644
--- a/src/plugins/cppeditor/cppeditor.h
+++ b/src/plugins/cppeditor/cppeditor.h
@@ -70,28 +70,21 @@ public:
         unsigned column;
         unsigned length;
 
-        Use()
-                : line(0), column(0), length(0) {}
-
-        Use(unsigned line, unsigned column, unsigned length)
-                : line(line), column(column), length(length) {}
+        Use(unsigned line = 0, unsigned column = 0, unsigned length = 0)
+            : line(line), column(column), length(length) {}
     };
 
     typedef QHash<CPlusPlus::Symbol *, QList<Use> > LocalUseMap;
     typedef QHashIterator<CPlusPlus::Symbol *, QList<Use> > LocalUseIterator;
 
-    typedef QHash<CPlusPlus::Identifier *, QList<Use> > ExternalUseMap;
-    typedef QHashIterator<CPlusPlus::Identifier *, QList<Use> > ExternalUseIterator;
-
     SemanticInfo()
-            : revision(-1)
+        : revision(-1)
     { }
 
     int revision;
     CPlusPlus::Snapshot snapshot;
     CPlusPlus::Document::Ptr doc;
     LocalUseMap localUses;
-    ExternalUseMap externalUses;
 };
 
 class SemanticHighlighter: public QThread
@@ -199,6 +192,7 @@ public Q_SLOTS:
     void renameSymbolUnderCursor();
     void renameUsages();
     void findUsages();
+    void renameUsagesNow();
 
     void moveToPreviousToken();
     void moveToNextToken();
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 95e1b8273d..6d9b9f8d0e 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -36,6 +36,7 @@
 #include <extensionsystem/pluginmanager.h>
 #include <utils/filesearch.h>
 #include <coreplugin/progressmanager/progressmanager.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/icore.h>
 
 #include <ASTVisitor.h>
@@ -57,7 +58,7 @@
 #include <QtCore/QTime>
 #include <QtCore/QtConcurrentRun>
 #include <QtCore/QDir>
-
+#include <QtGui/QApplication>
 #include <qtconcurrent/runextensions.h>
 
 using namespace CppTools::Internal;
@@ -163,12 +164,20 @@ protected:
         if (! symbol)
             return false;
 
-        else if (symbol == _declSymbol)
+        else if (symbol == _declSymbol) {
             return true;
 
-        else if (symbol->line() == _declSymbol->line() && symbol->column() == _declSymbol->column()) {
+        } else if (symbol->line() == _declSymbol->line() && symbol->column() == _declSymbol->column()) {
             if (! qstrcmp(symbol->fileName(), _declSymbol->fileName()))
                 return true;
+
+        } else if (symbol->isForwardClassDeclaration() && (_declSymbol->isClass() ||
+                                                           _declSymbol->isForwardClassDeclaration())) {
+            return true;
+
+        } else if (_declSymbol->isForwardClassDeclaration() && (symbol->isClass() ||
+                                                                symbol->isForwardClassDeclaration())) {
+            return true;
         }
 
         return false;
@@ -303,14 +312,22 @@ protected:
             }
         }
 
-        if (ast->unqualified_name) {
-            SimpleNameAST *simple_name = ast->unqualified_name->asSimpleName();
+        if (NameAST *unqualified_name = ast->unqualified_name) {
+            unsigned identifier_token = 0;
+
+            if (SimpleNameAST *simple_name = unqualified_name->asSimpleName())
+                identifier_token = simple_name->identifier_token;
+
+            else if (DestructorNameAST *dtor_name = unqualified_name->asDestructorName())
+                identifier_token = dtor_name->identifier_token;
 
             TemplateIdAST *template_id = 0;
-            if (! simple_name) {
-                template_id = ast->unqualified_name->asTemplateId();
+            if (! identifier_token) {
+                template_id = unqualified_name->asTemplateId();
 
                 if (template_id) {
+                    identifier_token = template_id->identifier_token;
+
                     for (TemplateArgumentListAST *template_arguments = template_id->template_arguments;
                          template_arguments; template_arguments = template_arguments->next) {
                         accept(template_arguments->template_argument);
@@ -318,14 +335,8 @@ protected:
                 }
             }
 
-            if (simple_name || template_id) {
-                const unsigned identifier_token = simple_name
-                        ? simple_name->identifier_token
-                        : template_id->identifier_token;
-
-                if (identifier(identifier_token) == _id)
-                    checkExpression(ast->firstToken(), identifier_token);
-            }
+            if (identifier_token && identifier(identifier_token) == _id)
+                checkExpression(ast->firstToken(), identifier_token);
         }
 
         return false;
@@ -464,7 +475,21 @@ static void find_helper(QFutureInterface<Utils::FileSearchResult> &future,
     const QString sourceFile = QString::fromUtf8(symbol->fileName(), symbol->fileNameLength());
 
     QStringList files(sourceFile);
-    files += snapshot.dependsOn(sourceFile);
+
+    if (symbol->isClass() || symbol->isForwardClassDeclaration()) {
+        foreach (const Document::Ptr &doc, snapshot) {
+            if (doc->fileName() == sourceFile)
+                continue;
+
+            Control *control = doc->control();
+
+            if (control->findIdentifier(symbolId->chars(), symbolId->size()))
+                files.append(doc->fileName());
+        }
+    } else {
+        files += snapshot.dependsOn(sourceFile);
+    }
+
     qDebug() << "done in:" << tm.elapsed() << "number of files to parse:" << files.size();
 
     future.setProgressRange(0, files.size());
@@ -544,15 +569,20 @@ void CppFindReferences::findUsages(Symbol *symbol)
 
 void CppFindReferences::renameUsages(Symbol *symbol)
 {
-    Find::SearchResult *search = _resultWindow->startNewSearch(Find::SearchResultWindow::SearchAndReplace);
+    if (Identifier *id = symbol->identifier()) {
+        const QString textToReplace = QString::fromUtf8(id->chars(), id->size());
 
-    connect(search, SIGNAL(activated(Find::SearchResultItem)),
-            this, SLOT(openEditor(Find::SearchResultItem)));
+        Find::SearchResult *search = _resultWindow->startNewSearch(Find::SearchResultWindow::SearchAndReplace);
+        _resultWindow->setTextToReplace(textToReplace);
 
-    connect(search, SIGNAL(replaceButtonClicked(QString,QList<Find::SearchResultItem>)),
-            SLOT(onReplaceButtonClicked(QString,QList<Find::SearchResultItem>)));
+        connect(search, SIGNAL(activated(Find::SearchResultItem)),
+                this, SLOT(openEditor(Find::SearchResultItem)));
 
-    findAll_helper(symbol);
+        connect(search, SIGNAL(replaceButtonClicked(QString,QList<Find::SearchResultItem>)),
+                SLOT(onReplaceButtonClicked(QString,QList<Find::SearchResultItem>)));
+
+        findAll_helper(symbol);
+    }
 }
 
 void CppFindReferences::findAll_helper(Symbol *symbol)
@@ -574,6 +604,23 @@ void CppFindReferences::findAll_helper(Symbol *symbol)
     connect(progress, SIGNAL(clicked()), _resultWindow, SLOT(popup()));
 }
 
+static void applyChanges(QTextDocument *doc, const QString &text, const QList<Find::SearchResultItem> &items)
+{
+    QList<QTextCursor> cursors;
+
+    foreach (const Find::SearchResultItem &item, items) {
+        const int blockNumber = item.lineNumber - 1;
+        QTextCursor tc(doc->findBlockByNumber(blockNumber));
+        tc.setPosition(tc.position() + item.searchTermStart);
+        tc.setPosition(tc.position() + item.searchTermLength,
+                       QTextCursor::KeepAnchor);
+        cursors.append(tc);
+    }
+
+    foreach (QTextCursor tc, cursors)
+        tc.insertText(text);
+}
+
 void CppFindReferences::onReplaceButtonClicked(const QString &text,
                                                const QList<Find::SearchResultItem> &items)
 {
@@ -585,47 +632,55 @@ void CppFindReferences::onReplaceButtonClicked(const QString &text,
     foreach (const Find::SearchResultItem &item, items)
         changes[item.fileName].append(item);
 
+    Core::EditorManager *editorManager = Core::EditorManager::instance();
+
     QHashIterator<QString, QList<Find::SearchResultItem> > it(changes);
     while (it.hasNext()) {
         it.next();
 
         const QString fileName = it.key();
-        QFile file(fileName);
-
-        if (file.open(QFile::ReadOnly)) {
-            QTextStream stream(&file);
-            // ### set the encoding
-            const QString plainText = stream.readAll();
-            file.close();
-
-            QTextDocument doc;
-            doc.setPlainText(plainText);
-
-            QList<QTextCursor> cursors;
-            const QList<Find::SearchResultItem> items = it.value();
-            foreach (const Find::SearchResultItem &item, items) {
-                const int blockNumber = item.lineNumber - 1;
-                QTextCursor tc(doc.findBlockByNumber(blockNumber));
-                tc.setPosition(tc.position() + item.searchTermStart);
-                tc.setPosition(tc.position() + item.searchTermLength,
-                               QTextCursor::KeepAnchor);
-                cursors.append(tc);
-            }
+        const QList<Find::SearchResultItem> items = it.value();
 
-            foreach (QTextCursor tc, cursors)
-                tc.insertText(text);
+        const QList<Core::IEditor *> editors = editorManager->editorsForFileName(fileName);
+        TextEditor::BaseTextEditor *textEditor = 0;
+        foreach (Core::IEditor *editor, editors) {
+            textEditor = qobject_cast<TextEditor::BaseTextEditor *>(editor->widget());
+            if (textEditor != 0)
+                break;
+        }
+
+        if (textEditor != 0) {
+            QTextCursor tc = textEditor->textCursor();
+            tc.beginEditBlock();
+            applyChanges(textEditor->document(), text, items);
+            tc.endEditBlock();
+        } else {
+            QFile file(fileName);
 
-            QFile newFile(fileName);
-            if (newFile.open(QFile::WriteOnly)) {
-                QTextStream stream(&newFile);
+            if (file.open(QFile::ReadOnly)) {
+                QTextStream stream(&file);
                 // ### set the encoding
-                stream << doc.toPlainText();
+                const QString plainText = stream.readAll();
+                file.close();
+
+                QTextDocument doc;
+                doc.setPlainText(plainText);
+
+                applyChanges(&doc, text, items);
+
+                QFile newFile(fileName);
+                if (newFile.open(QFile::WriteOnly)) {
+                    QTextStream stream(&newFile);
+                    // ### set the encoding
+                    stream << doc.toPlainText();
+                }
             }
         }
     }
 
     const QStringList fileNames = changes.keys();
     _modelManager->updateSourceFiles(fileNames);
+    _resultWindow->hide();
 }
 
 void CppFindReferences::displayResult(int index)
diff --git a/src/plugins/debugger/cdb/cdbdebugengine.cpp b/src/plugins/debugger/cdb/cdbdebugengine.cpp
index 11f37d15f1..c7f0405570 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugengine.cpp
@@ -302,6 +302,7 @@ CdbDebugEnginePrivate::CdbDebugEnginePrivate(DebuggerManager *manager,
     m_dumper(new CdbDumperHelper(manager, &m_cif)),
     m_currentThreadId(-1),
     m_eventThreadId(-1),
+    m_interrupted(false),
     m_watchTimer(-1),
     m_debugEventCallBack(engine),
     m_engine(engine),
@@ -445,6 +446,7 @@ void CdbDebugEnginePrivate::clearForRun()
 
     m_breakEventMode = BreakEventHandle;
     m_eventThreadId = -1;
+    m_interrupted = false;
     cleanStackTrace();
 }
 
@@ -1026,6 +1028,9 @@ bool CdbDebugEngine::step(unsigned long executionStatus)
             warning(msgStepFailed(executionStatus, m_d->m_currentThreadId, msgDebuggerCommandFailed(command, hr)));
     }
     if (success) {
+        // Oddity: Step into will first break at the calling function. Ignore
+        if (executionStatus == DEBUG_STATUS_STEP_INTO || executionStatus == DEBUG_STATUS_REVERSE_STEP_INTO)
+            m_d->m_breakEventMode = CdbDebugEnginePrivate::BreakEventIgnoreOnce;
         startWatchTimer();
         setState(InferiorRunning, Q_FUNC_INFO, __LINE__);
     } else {
@@ -1169,7 +1174,9 @@ bool CdbDebugEnginePrivate::interruptInterferiorProcess(QString *errorMessage)
         qDebug() << Q_FUNC_INFO << "\n    ex=" << executionStatus;
     }
 
-    if (!DebugBreakProcess(m_hDebuggeeProcess)) {
+    if (DebugBreakProcess(m_hDebuggeeProcess)) {
+        m_interrupted = true;
+    } else {
         *errorMessage = QString::fromLatin1("DebugBreakProcess failed: %1").arg(Utils::winErrorMessage(GetLastError()));
         return false;
     }
@@ -1704,12 +1711,34 @@ ULONG CdbDebugEnginePrivate::updateThreadList()
     QList<ThreadData> threads;
     ULONG currentThreadId;
     QString errorMessage;
+    // When interrupting, an artifical thread with a breakpoint is created.
     if (!CdbStackTraceContext::getThreads(m_cif, true, &threads, &currentThreadId, &errorMessage))
         m_engine->warning(errorMessage);
     manager()->threadsHandler()->setThreads(threads);
     return currentThreadId;
 }
 
+// Figure out the thread to run the dumpers in (see notes on.
+// CdbDumperHelper). Avoid the artifical threads created by interrupt
+// and threads that are in waitFor().
+// A stricter version could only use the thread if it is the event
+// thread of a step or breakpoint hit (see CdbDebugEnginePrivate::m_interrupted).
+
+static inline unsigned long dumperThreadId(const QList<StackFrame> &frames,
+                                           unsigned long currentThread)
+{
+    if (frames.empty())
+        return CdbDumperHelper::InvalidDumperCallThread;
+    if (frames.at(0).function == QLatin1String(CdbStackTraceContext::winFuncDebugBreakPoint))
+        return CdbDumperHelper::InvalidDumperCallThread;
+    const int waitCheckDepth = qMin(frames.size(), 5);
+    static const QString waitForPrefix = QLatin1String(CdbStackTraceContext::winFuncWaitForPrefix);
+    for (int f = 0; f < waitCheckDepth; f++)
+        if (frames.at(f).function.startsWith(waitForPrefix))
+            return CdbDumperHelper::InvalidDumperCallThread;
+    return currentThread;
+}
+
 void CdbDebugEnginePrivate::updateStackTrace()
 {
     if (debugCDB)
@@ -1750,11 +1779,19 @@ void CdbDebugEnginePrivate::updateStackTrace()
                             CdbDebugEngine::tr("Thread %1: No debug information available (%2).").arg(m_currentThreadId).arg(topFunction);
         m_engine->warning(msg);
     }
-
+    // Set up dumper with a thread (or invalid)
+    const unsigned long dumperThread = dumperThreadId(stackFrames, m_currentThreadId);
+    if (debugCDB)
+        qDebug() << "updateStackTrace() current: " << m_currentThreadId << " dumper=" << dumperThread;
+    m_dumper->setDumperCallThread(dumperThread);
+    // Display frames
     manager()->stackHandler()->setFrames(stackFrames);
     m_firstActivatedFrame = true;
     if (current >= 0) {
         manager()->stackHandler()->setCurrentIndex(current);
+        // First time : repaint
+        if (m_dumper->isEnabled() && m_dumper->state() != CdbDumperHelper::Initialized)
+            QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
         m_engine->activateFrame(current);
     }
     manager()->watchHandler()->updateWatchers();
diff --git a/src/plugins/debugger/cdb/cdbdebugengine_p.h b/src/plugins/debugger/cdb/cdbdebugengine_p.h
index 72a154906c..73fb7d41fa 100644
--- a/src/plugins/debugger/cdb/cdbdebugengine_p.h
+++ b/src/plugins/debugger/cdb/cdbdebugengine_p.h
@@ -156,6 +156,7 @@ struct CdbDebugEnginePrivate
     const QSharedPointer<CdbOptions>  m_options;
     HANDLE                  m_hDebuggeeProcess;
     HANDLE                  m_hDebuggeeThread;
+    bool                    m_interrupted;
     int                     m_currentThreadId;
     int                     m_eventThreadId;
     HandleBreakEventMode    m_breakEventMode;
diff --git a/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
index fcebdee779..21f867ede2 100644
--- a/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
@@ -248,6 +248,7 @@ STDMETHODIMP CdbDebugEventCallback::Exception(
     if (debugCDB)
         qDebug() << Q_FUNC_INFO << "\nex=" << Exception->ExceptionCode << " fatal=" << fatal << msg;
     m_pEngine->manager()->showApplicationOutput(msg);
+    m_pEngine->manager()->showDebuggerOutput(LogMisc, msg);
     if (fatal)
         m_pEngine->m_d->notifyCrashed();
     return S_OK;
diff --git a/src/plugins/debugger/cdb/cdbdumperhelper.cpp b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
index b0757784e0..9d1d8c9713 100644
--- a/src/plugins/debugger/cdb/cdbdumperhelper.cpp
+++ b/src/plugins/debugger/cdb/cdbdumperhelper.cpp
@@ -41,8 +41,10 @@
 #include <QtCore/QRegExp>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QTextStream>
+#include <QtCore/QTime>
 
 enum { loadDebug = 0 };
+enum { dumpDebug = 0 };
 
 static const char *dumperModuleNameC = "gdbmacros";
 static const char *qtCoreModuleNameC = "QtCore";
@@ -158,24 +160,25 @@ static bool debuggeeLoadLibrary(DebuggerManager *manager,
     // We want to call "HMODULE LoadLibraryA(LPCTSTR lpFileName)"
     // (void* LoadLibraryA(char*)). However, despite providing a symbol
     // server, the debugger refuses to recognize it as a function.
-    // Set up the call stack with a function of same signature (qstrdup)
-    // and change the call register to LoadLibraryA() before executing "g".
+    // Call with a prototype of 'qstrdup', as it is the same
     // Prepare call: Locate 'qstrdup' in the (potentially namespaced) corelib. For some
     // reason, the symbol is present in QtGui as well without type information.
     QString dummyFunc = QLatin1String("*qstrdup");
     if (resolveSymbol(cif->debugSymbols, QLatin1String("QtCore[d]*4!"), &dummyFunc, errorMessage) != ResolveSymbolOk)
         return false;
-    QString callCmd = QLatin1String(".call ");
-    callCmd += dummyFunc;
-    callCmd += QLatin1String("(0x");
-    callCmd += QString::number(nameAddress, 16);
-    callCmd += QLatin1Char(')');
+
+    QString callCmd; {
+        QTextStream str(&callCmd);
+        str.setIntegerBase(16);
+        str << ".call /s " << dummyFunc << " Kernel32!LoadLibraryA(0x" << nameAddress << ')';
+    }
+    if (loadDebug)
+        qDebug() << "Calling" << callCmd;
+
     if (!CdbDebugEnginePrivate::executeDebuggerCommand(cif->debugControl, callCmd, errorMessage))
         return false;
-    if (!CdbDebugEnginePrivate::executeDebuggerCommand(cif->debugControl, QLatin1String("r eip=Kernel32!LoadLibraryA"), errorMessage))
-        return false;
-    // This will hit a breakpoint.
-    if (!CdbDebugEnginePrivate::executeDebuggerCommand(cif->debugControl, QString(QLatin1Char('g')), errorMessage))
+    // Execute current thread. This will hit a breakpoint.
+    if (!CdbDebugEnginePrivate::executeDebuggerCommand(cif->debugControl, QLatin1String("~. g"), errorMessage))
         return false;
     const HRESULT hr = cif->debugControl->WaitForEvent(0, waitTimeOutMS);
     if (FAILED(hr)) {
@@ -185,6 +188,14 @@ static bool debuggeeLoadLibrary(DebuggerManager *manager,
     return true;
 }
 
+// Format a "go" in a thread
+static inline QString goCommand(unsigned long threadId)
+{
+    QString rc;
+    QTextStream(&rc) << '~' << threadId << " g";
+    return rc;
+}
+
 // ---- Load messages
 static inline QString msgMethod(bool injectOrCall)
 {
@@ -226,7 +237,9 @@ CdbDumperHelper::CdbDumperHelper(DebuggerManager *manager,
     m_inBufferSize(0),
     m_outBufferAddress(0),
     m_outBufferSize(0),
-    m_buffer(0)
+    m_buffer(0),
+    m_dumperCallThread(0),
+    m_goCommand(goCommand(m_dumperCallThread))
 {
 }
 
@@ -324,7 +337,7 @@ CdbDumperHelper::CallLoadResult CdbDumperHelper::initCallLoad(QString *errorMess
 bool CdbDumperHelper::ensureInitialized(QString *errorMessage)
 {
     if (loadDebug)
-        qDebug() << Q_FUNC_INFO << '\n' << m_state;
+        qDebug() << "ensureInitialized thread: " << m_dumperCallThread << " state: " << m_state;
 
     switch (m_state) {
     case Disabled:
@@ -372,6 +385,9 @@ bool CdbDumperHelper::ensureInitialized(QString *errorMessage)
         m_manager->showDebuggerOutput(LogMisc, *errorMessage);
         m_manager->showQtDumperLibraryWarning(*errorMessage);
     }
+    if (loadDebug)
+        qDebug() << Q_FUNC_INFO << '\n' << ok;
+
     return ok;
 }
 
@@ -451,7 +467,7 @@ bool CdbDumperHelper::initKnownTypes(QString *errorMessage)
         *errorMessage = QtDumperHelper::msgDumperOutdated(dumperVersionRequired, m_helper.dumperVersion());
         return false;
     }
-    if (loadDebug)
+    if (loadDebug || dumpDebug)
         qDebug() << Q_FUNC_INFO << m_helper.toString(true);
     return true;
 }
@@ -492,8 +508,11 @@ bool CdbDumperHelper::callDumper(const QString &callCmd, const QByteArray &inBuf
     // by using 'gN' (go not handled -> pass handling to dumper __try/__catch block)
     for (int i = 0; i < 10; i++) {
         const int oldExceptionCount = exLogger.exceptionCount();
-        // Go. If an exception occurs in loop 2, let the dumper handle it.
-        const QString goCmd = i ? QString(QLatin1String("gN")) : QString(QLatin1Char('g'));
+        // Go in current thread. If an exception occurs in loop 2,
+        // let the dumper handle it.
+        QString goCmd = m_goCommand;
+        if (i)
+            goCmd = QLatin1Char('N');
         if (!CdbDebugEnginePrivate::executeDebuggerCommand(m_cif->debugControl, goCmd, errorMessage))
             return false;
         HRESULT hr = m_cif->debugControl->WaitForEvent(0, waitTimeOutMS);
@@ -556,6 +575,18 @@ static inline QString msgNotHandled(const QString &type)
 CdbDumperHelper::DumpResult CdbDumperHelper::dumpType(const WatchData &wd, bool dumpChildren,
                                                       QList<WatchData> *result, QString *errorMessage)
 {
+    if (dumpDebug)
+        qDebug() << ">dumpType() thread: " << m_dumperCallThread << " state: " << m_state << wd.type << QTime::currentTime().toString();
+    const CdbDumperHelper::DumpResult rc = dumpTypeI(wd, dumpChildren, result, errorMessage);
+    if (dumpDebug)
+        qDebug() << "<dumpType() state: " << m_state << wd.type << " returns " << rc << *errorMessage << QTime::currentTime().toString();
+    return rc;
+}
+
+CdbDumperHelper::DumpResult CdbDumperHelper::dumpTypeI(const WatchData &wd, bool dumpChildren,
+                                                      QList<WatchData> *result, QString *errorMessage)
+{
+    errorMessage->clear();
     // Check failure cache and supported types
     if (m_state == Disabled) {
         *errorMessage = QLatin1String("Dumpers are disabled");
@@ -570,6 +601,20 @@ CdbDumperHelper::DumpResult CdbDumperHelper::dumpType(const WatchData &wd, bool
         return DumpNotHandled;
     }
 
+    // Do we have a thread
+    if (m_dumperCallThread == InvalidDumperCallThread) {
+        *errorMessage = QString::fromLatin1("No thread to call.");
+        if (loadDebug)
+            qDebug() << *errorMessage;
+        return DumpNotHandled;
+    }
+
+    // Delay initialization as much as possible
+    if (isIntOrFloatType(wd.type)) {
+        *errorMessage = QString::fromLatin1("Unhandled POD: " ) + wd.type;
+        return DumpNotHandled;
+    }
+
     // Ensure types are parsed and known.
     if (!ensureInitialized(errorMessage)) {
         *errorMessage = msgDumpFailed(wd, errorMessage);
@@ -722,5 +767,18 @@ bool CdbDumperHelper::runTypeSizeQuery(const QString &typeName, int *size, QStri
     return true;
 }
 
+unsigned long CdbDumperHelper::dumperCallThread()
+{
+    return m_dumperCallThread;
+}
+
+void CdbDumperHelper::setDumperCallThread(unsigned long t)
+{
+    if (m_dumperCallThread != t) {
+        m_dumperCallThread = t;
+        m_goCommand = goCommand(m_dumperCallThread);
+    }
+}
+
 } // namespace Internal
 } // namespace Debugger
diff --git a/src/plugins/debugger/cdb/cdbdumperhelper.h b/src/plugins/debugger/cdb/cdbdumperhelper.h
index eaa7a1db7b..ca95fe4779 100644
--- a/src/plugins/debugger/cdb/cdbdumperhelper.h
+++ b/src/plugins/debugger/cdb/cdbdumperhelper.h
@@ -55,7 +55,17 @@ struct CdbComInterfaces;
  * dumpType() is the main query function to obtain a list  of WatchData from
  * WatchData item produced by the smbol context.
  * Call disable(), should the debuggee crash (as performing debuggee
- * calls is no longer possible, then).*/
+ * calls is no longer possible, then).
+ *
+ * dumperCallThread specifies the thread to use when making the calls.
+ * As of Debugging Tools v 6.11.1.404 (6.10.2009), calls cannot be executed
+ * when the current thread is in some WaitFor...() function. The call will
+ * then hang (regardless whether that thread or some other, non-blocking thread
+ * is used), and the debuggee will be in running state afterwards (causing errors
+ * from ReadVirtual, etc).
+ * The current thread can be used when stepping or a breakpoint was
+ * hit. When interrupting the inferior, an artifical thread is created,
+ * that is not usable, either. */
 
 class CdbDumperHelper
 {
@@ -93,6 +103,10 @@ public:
 
     inline CdbComInterfaces *comInterfaces() const { return m_cif; }
 
+    enum { InvalidDumperCallThread = 0xFFFFFFFF };
+    unsigned long dumperCallThread();
+    void setDumperCallThread(unsigned long t);
+
 private:
     enum CallLoadResult { CallLoadOk, CallLoadError, CallLoadNoQtApp, CallLoadAlreadyLoaded };
 
@@ -103,6 +117,9 @@ private:
     bool initResolveSymbols(QString *errorMessage);
     bool initKnownTypes(QString *errorMessage);
 
+    inline DumpResult dumpTypeI(const WatchData &d, bool dumpChildren,
+                                QList<WatchData> *result, QString *errorMessage);
+
     bool getTypeSize(const QString &typeName, int *size, QString *errorMessage);
     bool runTypeSizeQuery(const QString &typeName, int *size, QString *errorMessage);
     bool callDumper(const QString &call, const QByteArray &inBuffer, const char **outputPtr,
@@ -134,6 +151,8 @@ private:
     QStringList m_failedTypes;
 
     QtDumperHelper m_helper;
+    unsigned long m_dumperCallThread;
+    QString m_goCommand;
 };
 
 } // namespace Internal
diff --git a/src/plugins/debugger/cdb/cdbexceptionutils.cpp b/src/plugins/debugger/cdb/cdbexceptionutils.cpp
index 6404733308..4975b69724 100644
--- a/src/plugins/debugger/cdb/cdbexceptionutils.cpp
+++ b/src/plugins/debugger/cdb/cdbexceptionutils.cpp
@@ -41,7 +41,11 @@ enum { debugExc = 0 };
 // Special exception codes.
 enum { cppExceptionCode = 0xe06d7363, startupCompleteTrap = 0x406d1388,
        rpcServerUnavailableExceptionCode = 0x6ba,
-       dllNotFoundExceptionCode = 0xc0000135 };
+       dllNotFoundExceptionCode = 0xc0000135,
+       dllInitFailed = 0xc0000142,
+       missingSystemFile = 0xc0000143,
+       appInitFailed = 0xc0000143
+   };
 
 namespace Debugger {
 namespace Internal {
@@ -172,6 +176,12 @@ void formatException(const EXCEPTION_RECORD64 *e, QTextStream &str)
     case dllNotFoundExceptionCode:
         str << "DLL not found";
         break;
+    case dllInitFailed:
+        str << "DLL failed to initialize";
+        break;
+    case missingSystemFile:
+        str << "System file is missing";
+        break;
     case EXCEPTION_ACCESS_VIOLATION: {
             const bool writeOperation = e->ExceptionInformation[0];
             str << (writeOperation ? "write" : "read")
diff --git a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
index 8cf72461fe..605eeb61db 100644
--- a/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
+++ b/src/plugins/debugger/cdb/cdbstacktracecontext.cpp
@@ -40,6 +40,10 @@
 namespace Debugger {
 namespace Internal {
 
+const char *CdbStackTraceContext::winFuncFastSystemCallRet = "ntdll!KiFastSystemCallRet";
+const char *CdbStackTraceContext::winFuncDebugBreakPoint = "ntdll!DbgBreakPoint";
+const char *CdbStackTraceContext::winFuncWaitForPrefix = "kernel32!WaitFor";
+
 CdbStackTraceContext::CdbStackTraceContext(const QSharedPointer<CdbDumperHelper> &dumper) :
         m_dumper(dumper),
         m_cif(dumper->comInterfaces()),
@@ -232,6 +236,7 @@ static inline bool getStoppedThreadState(const CdbComInterfaces &cif,
                                          ThreadData *t,
                                          QString *errorMessage)
 {
+    enum { MaxFrames = 2 };
     ULONG currentThread;
     HRESULT hr = cif.debugSystemObjects->GetCurrentThreadId(&currentThread);
     if (FAILED(hr)) {
@@ -246,29 +251,38 @@ static inline bool getStoppedThreadState(const CdbComInterfaces &cif,
         }
     }
     ULONG frameCount;
-    DEBUG_STACK_FRAME topFrame[1];
-    hr = cif.debugControl->GetStackTrace(0, 0, 0, topFrame, 1, &frameCount);
+    // Ignore the top frame if it is "ntdll!KiFastSystemCallRet", which is
+    // not interesting for display.    
+    DEBUG_STACK_FRAME frames[MaxFrames];
+    hr = cif.debugControl->GetStackTrace(0, 0, 0, frames, MaxFrames, &frameCount);
     if (FAILED(hr)) {
         *errorMessage = msgGetThreadStateFailed(t->id, msgComFailed("GetStackTrace", hr));
         return false;
     }
-
-    t->address = topFrame[0].InstructionOffset;
+    // Ignore the top frame if it is "ntdll!KiFastSystemCallRet", which is
+    // not interesting for display.
     WCHAR wszBuf[MAX_PATH];
-
-    cif.debugSymbols->GetNameByOffsetWide(topFrame[0].InstructionOffset, wszBuf, MAX_PATH, 0, 0);
-    t->function = QString::fromUtf16(reinterpret_cast<const ushort *>(wszBuf));
-    ULONG ulLine;
-    hr = cif.debugSymbols->GetLineByOffsetWide(topFrame[0].InstructionOffset, &ulLine, wszBuf, MAX_PATH, 0, 0);
-    if (SUCCEEDED(hr)) {
-        t->line = ulLine;
-        // Just display base name
-        t->file = QString::fromUtf16(reinterpret_cast<const ushort *>(wszBuf));
-        if (!t->file.isEmpty()) {
-            const int slashPos = t->file.lastIndexOf(QLatin1Char('\\'));
-            if (slashPos != -1)
-                t->file.remove(0, slashPos + 1);
-        }
+    for (int frame = 0; frame < MaxFrames; frame++) {
+        cif.debugSymbols->GetNameByOffsetWide(frames[frame].InstructionOffset, wszBuf, MAX_PATH, 0, 0);
+        t->function = QString::fromUtf16(reinterpret_cast<const ushort *>(wszBuf));
+        if (frame != 0  || t->function != QLatin1String(CdbStackTraceContext::winFuncFastSystemCallRet)) {
+            t->address = frames[frame].InstructionOffset;
+            cif.debugSymbols->GetNameByOffsetWide(frames[frame].InstructionOffset, wszBuf, MAX_PATH, 0, 0);
+            t->function = QString::fromUtf16(reinterpret_cast<const ushort *>(wszBuf));
+            ULONG ulLine;
+            hr = cif.debugSymbols->GetLineByOffsetWide(frames[frame].InstructionOffset, &ulLine, wszBuf, MAX_PATH, 0, 0);
+            if (SUCCEEDED(hr)) {
+                t->line = ulLine;
+                // Just display base name
+                t->file = QString::fromUtf16(reinterpret_cast<const ushort *>(wszBuf));
+                if (!t->file.isEmpty()) {
+                    const int slashPos = t->file.lastIndexOf(QLatin1Char('\\'));
+                    if (slashPos != -1)
+                        t->file.remove(0, slashPos + 1);
+                }
+            }
+            break;
+        } // was not "ntdll!KiFastSystemCallRet"
     }
     return true;
 }
diff --git a/src/plugins/debugger/cdb/cdbstacktracecontext.h b/src/plugins/debugger/cdb/cdbstacktracecontext.h
index ff8c62d5b1..3b0e2061fc 100644
--- a/src/plugins/debugger/cdb/cdbstacktracecontext.h
+++ b/src/plugins/debugger/cdb/cdbstacktracecontext.h
@@ -63,6 +63,13 @@ class CdbStackTraceContext
 public:
     enum { maxFrames = 100 };
 
+    // Some well known-functions
+    static const char *winFuncFastSystemCallRet;
+    // WaitFor...
+    static const char *winFuncWaitForPrefix;
+    // Dummy function used for interrupting a debuggee
+    static const char *winFuncDebugBreakPoint;
+
     ~CdbStackTraceContext();
     static CdbStackTraceContext *create(const QSharedPointer<CdbDumperHelper> &dumper,
                                         unsigned long threadid,
diff --git a/src/plugins/debugger/gdb/gdb.pri b/src/plugins/debugger/gdb/gdb.pri
index 344f724eeb..5dc9fc8373 100644
--- a/src/plugins/debugger/gdb/gdb.pri
+++ b/src/plugins/debugger/gdb/gdb.pri
@@ -1,5 +1,10 @@
 include(../../../shared/trk/trk.pri)
 
+!isEmpty(SUPPORT_QT_S60) {
+    message("Adding experimental support for Qt/S60 applications.")
+    DEFINES += QTCREATOR_WITH_S60
+}
+
 HEADERS += \
     $$PWD/gdbmi.h \
     $$PWD/gdbengine.h \
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index dfd9e95410..b92e8e7b54 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -4227,8 +4227,9 @@ void GdbEngine::handleAdapterShutdownFailed(const QString &msg)
 void GdbEngine::addOptionPages(QList<Core::IOptionsPage*> *opts) const
 {
     opts->push_back(new GdbOptionsPage);
-    if (!qgetenv("QTCREATOR_WITH_S60").isEmpty())
+#ifdef QTCREATOR_WITH_S60
         opts->push_back(new TrkOptionsPage(m_trkAdapter->options()));
+#endif
 }
 
 void GdbEngine::showMessageBox(int icon, const QString &title, const QString &text)
diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp
index 2f846cd89c..a995dfc5b7 100644
--- a/src/plugins/find/searchresultwindow.cpp
+++ b/src/plugins/find/searchresultwindow.cpp
@@ -104,6 +104,17 @@ SearchResultWindow::~SearchResultWindow()
     m_items.clear();
 }
 
+void SearchResultWindow::setTextToReplace(const QString &textToReplace)
+{
+    m_replaceTextEdit->setText(textToReplace);
+    m_replaceTextEdit->selectAll();
+}
+
+QString SearchResultWindow::textToReplace() const
+{
+    return m_replaceTextEdit->text();
+}
+
 void SearchResultWindow::setShowReplaceUI(bool show)
 {
     m_searchResultTreeView->model()->setShowReplaceUI(show);
@@ -169,6 +180,7 @@ SearchResult *SearchResultWindow::startNewSearch(SearchMode searchOrSearchAndRep
 void SearchResultWindow::clearContents()
 {
     setReplaceUIEnabled(false);
+    m_replaceTextEdit->clear();
     m_searchResultTreeView->clear();
     m_items.clear();
     m_widget->setCurrentWidget(m_searchResultTreeView);
diff --git a/src/plugins/find/searchresultwindow.h b/src/plugins/find/searchresultwindow.h
index 093eb26884..c41ca3424f 100644
--- a/src/plugins/find/searchresultwindow.h
+++ b/src/plugins/find/searchresultwindow.h
@@ -106,6 +106,9 @@ public:
     void setShowReplaceUI(bool show);
     bool isShowingReplaceUI() const;
 
+    void setTextToReplace(const QString &textToReplace);
+    QString textToReplace() const;
+
     // search result object only lives till next startnewsearch call
     SearchResult *startNewSearch(SearchMode searchOrSearchAndReplace = SearchOnly);
 
diff --git a/src/plugins/projectexplorer/buildmanager.cpp b/src/plugins/projectexplorer/buildmanager.cpp
index 54f821dd7e..14ecc4bfd0 100644
--- a/src/plugins/projectexplorer/buildmanager.cpp
+++ b/src/plugins/projectexplorer/buildmanager.cpp
@@ -341,9 +341,9 @@ void BuildManager::buildProjects(const QList<Project *> &projects, const QList<Q
             }
         }
     }
-    startBuildQueue();
     if (ProjectExplorerPlugin::instance()->projectExplorerSettings().showCompilerOutput)
         m_outputWindow->popup(false);
+    startBuildQueue();
 }
 
 void BuildManager::cleanProjects(const QList<Project *> &projects, const QList<QString> &configurations)
@@ -359,9 +359,9 @@ void BuildManager::cleanProjects(const QList<Project *> &projects, const QList<Q
             buildQueueAppend(bs, *cit);
         }
     }
-    startBuildQueue();
     if (ProjectExplorerPlugin::instance()->projectExplorerSettings().showCompilerOutput)
         m_outputWindow->popup(false);
+    startBuildQueue();
 }
 
 void BuildManager::buildProject(Project *p, const QString &configuration)
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index a6cb33ec22..f966fa3308 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -335,7 +335,8 @@ QByteArray MSVCToolChain::predefinedMacros()
         m_predefinedMacros += "#define __MSVCRT__\n"
                               "#define __WINNT__\n"
                               "#define __WINNT\n"
-                              "#define WINNT\n";
+                              "#define WINNT\n"
+                              "#define __int64 long long";
 
         QString tmpFilePath;
         {
diff --git a/src/plugins/qt4projectmanager/projectloadwizard.cpp b/src/plugins/qt4projectmanager/projectloadwizard.cpp
index 7bcb6ea849..f559806cec 100644
--- a/src/plugins/qt4projectmanager/projectloadwizard.cpp
+++ b/src/plugins/qt4projectmanager/projectloadwizard.cpp
@@ -146,7 +146,6 @@ void ProjectLoadWizard::done(int result)
     // This normally happens on showing the final page, but since we
     // don't show it anymore, do it here
 
-    QString directory = QFileInfo(m_project->file()->fileName()).absolutePath();
     if (m_importVersion && importCheckbox->isChecked()) {
         // Importing
         if (m_temporaryVersion)
diff --git a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
index 6fb44d1cbb..d666321692 100644
--- a/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
+++ b/src/plugins/qt4projectmanager/qt-s60/qt-s60.pri
@@ -1,6 +1,4 @@
-win32:SUPPORT_QT_S60=1
-else:SUPPORT_QT_S60 = $$(QTCREATOR_WITH_S60)
-!isEmpty(SUPPORT_QT_S60) { 
+!isEmpty(SUPPORT_QT_S60) {
     message("Adding experimental support for Qt/S60 applications.")
     DEFINES += QTCREATOR_WITH_S60
     SOURCES += $$PWD/s60devices.cpp \
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 1aa46aacd2..81f1112415 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -209,9 +209,18 @@ static QString localExecutableFromPkgFile(const QString &pkgFileName, QString *e
     // "<SDK>/foo.exe"    - "!:\device_bin\foo.exe"
     const QRegExp exePattern = QRegExp(QLatin1String("^\"([^\"]+\\.exe)\" +-.*$"));
     Q_ASSERT(exePattern.isValid());
-    foreach(const QString &line, QString::fromLocal8Bit(pkgFile.readAll()).split(QLatin1Char('\n')))
-        if (exePattern.exactMatch(line))
-            return exePattern.cap(1);
+
+    foreach(const QString &line, QString::fromLocal8Bit(pkgFile.readAll()).split(QLatin1Char('\n'))) {
+        if (exePattern.exactMatch(line)) {
+            QString rc = exePattern.cap(1);
+#ifdef Q_OS_WIN
+            // Sometimes, the drive letter is missing. Use that of the pkg file
+            if (rc.at(0) == QLatin1Char('/'))
+                rc.insert(0, pkgFileName.left(2));
+#endif
+            return rc;
+        }
+    }
     *errorMessage = S60DeviceRunConfiguration::tr("Unable to find the executable in the package file %1.").arg(pkgFileName);
     return QString();
 }
@@ -629,6 +638,7 @@ void S60DeviceRunControlBase::signsisProcessFinished()
     connect(m_launcher, SIGNAL(copyingStarted()), this, SLOT(printCopyingNotice()));
     connect(m_launcher, SIGNAL(canNotCreateFile(QString,QString)), this, SLOT(printCreateFileFailed(QString,QString)));
     connect(m_launcher, SIGNAL(canNotWriteFile(QString,QString)), this, SLOT(printWriteFileFailed(QString,QString)));
+    connect(m_launcher, SIGNAL(canNotCloseFile(QString,QString)), this, SLOT(printCloseFileFailed(QString,QString)));
     connect(m_launcher, SIGNAL(installingStarted()), this, SLOT(printInstallingNotice()));
     connect(m_launcher, SIGNAL(canNotInstall(QString,QString)), this, SLOT(printInstallFailed(QString,QString)));
     connect(m_launcher, SIGNAL(copyProgress(int)), this, SLOT(printCopyProgress(int)));
@@ -662,6 +672,12 @@ void S60DeviceRunControlBase::printWriteFileFailed(const QString &filename, cons
     emit addToOutputWindow(this, tr("Could not write to file %1 on device: %2").arg(filename, errorMessage));
 }
 
+void S60DeviceRunControlBase::printCloseFileFailed(const QString &filename, const QString &errorMessage)
+{
+    const QString msg = tr("Could not close file %1 on device: %2. It will be closed when App TRK is closed.");
+    emit addToOutputWindow(this, msg.arg(filename, errorMessage));
+}
+
 void S60DeviceRunControlBase::printCopyingNotice()
 {
     emit addToOutputWindow(this, tr("Copying install file..."));
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
index 65f9d7f3ee..657789a5f6 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
@@ -173,6 +173,7 @@ private slots:
     void printCopyingNotice();
     void printCreateFileFailed(const QString &filename, const QString &errorMessage);
     void printWriteFileFailed(const QString &filename, const QString &errorMessage);
+    void printCloseFileFailed(const QString &filename, const QString &errorMessage);
     void printCopyProgress(int progress);
     void printInstallingNotice();
     void printInstallFailed(const QString &filename, const QString &errorMessage);
diff --git a/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp b/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp
index 79366d9cc0..a1a0b7b859 100644
--- a/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.cpp
@@ -42,33 +42,15 @@ namespace {
     const char * const USBSER = "Services/usbser/Enum";
 }
 
-//#ifdef Q_OS_WIN
-//GUID WceusbshGUID = { 0x25dbce51, 0x6c8f, 0x4a72,
-//                      0x8a,0x6d,0xb5,0x4c,0x2b,0x4f,0xc8,0x35 };
-//#endif
-
 SerialDeviceLister::SerialDeviceLister(QObject *parent)
         : QObject(parent),
         m_initialized(false)
-//        , m_devNotifyHandle(0)
 {
-//#ifdef Q_OS_WIN
-//    // register for events
-//    DEV_BROADCAST_DEVICEINTERFACE NotificationFilter;
-//    ZeroMemory( &NotificationFilter, sizeof(NotificationFilter) );
-//    NotificationFilter.dbcc_size = sizeof(DEV_BROADCAST_DEVICEINTERFACE);
-//    NotificationFilter.dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE;
-//    NotificationFilter.dbcc_classguid  = WceusbshGUID;
-//    m_devNotifyHandle = RegisterDeviceNotification(QApplication::topLevelWidgets().at(0)->winId(), &NotificationFilter, DEVICE_NOTIFY_WINDOW_HANDLE);
-//#endif
+
 }
 
 SerialDeviceLister::~SerialDeviceLister()
 {
-//#ifdef Q_OS_WIN
-//    if (m_devNotifyHandle)
-//        UnregisterDeviceNotification(m_devNotifyHandle);
-//#endif
 }
 
 QList<SerialDeviceLister::SerialDevice> SerialDeviceLister::serialDevices() const
diff --git a/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.h b/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.h
index eef4113cc4..f2f71842c6 100644
--- a/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.h
+++ b/src/plugins/qt4projectmanager/qt-s60/serialdevicelister.h
@@ -69,11 +69,6 @@ private:
 
     mutable bool m_initialized;
     mutable QList<SerialDevice> m_devices;
-
-//#ifdef Q_OS_WIN
-//private:
-//    HDEVNOTIFY m_devNotifyHandle;
-//#endif
 };
 
 } // Internal
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index a2918a0dc2..afddbe174e 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -358,6 +358,7 @@ bool Qt4Project::restoreSettingsImpl(PersistentSettingsReader &settingsReader)
 
     // Ensure that the qt version and tool chain in each build configuration is valid
     // or if not, is reset to the default
+
     foreach (BuildConfiguration *bc, buildConfigurations()) {
         qtVersionId(bc);
         toolChainType(bc);
diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
index b2ae002371..74f364880b 100644
--- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
@@ -145,7 +145,7 @@ QString Qt4ProjectConfigWidget::displayName() const
 void Qt4ProjectConfigWidget::init(const QString &buildConfiguration)
 {
     if (debug)
-        qDebug() << "Qt4ProjectConfigWidget::init()";
+        qDebug() << "Qt4ProjectConfigWidget::init() for"<<buildConfiguration;
 
     m_buildConfiguration = buildConfiguration;
     ProjectExplorer::BuildConfiguration *bc = m_pro->buildConfiguration(buildConfiguration);
@@ -183,6 +183,7 @@ void Qt4ProjectConfigWidget::setupQtVersionsComboBox()
     m_ui->qtVersionComboBox->addItem(tr("Default Qt Version (%1)").arg(vm->defaultVersion()->name()), 0);
 
     int qtVersionId = m_pro->qtVersionId(m_pro->buildConfiguration(m_buildConfiguration));
+
     if (qtVersionId == 0) {
         m_ui->qtVersionComboBox->setCurrentIndex(0);
         m_ui->invalidQtWarningLabel->setVisible(false);
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp
index 7631c17ad0..fadaf92318 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.cpp
+++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp
@@ -159,6 +159,7 @@ QtVersionManager *QtVersionManager::instance()
 void QtVersionManager::addVersion(QtVersion *version)
 {
     m_versions.append(version);
+    m_uniqueIdToIndex.insert(version->uniqueId(), m_versions.count() - 1);
     emit qtVersionsChanged();
     writeVersionsIntoSettings();
 }
@@ -528,7 +529,7 @@ void QtVersion::setName(const QString &name)
 
 void QtVersion::setQMakeCommand(const QString& qmakeCommand)
 {
-    m_qmakeCommand = qmakeCommand;
+    m_qmakeCommand = QDir::fromNativeSeparators(qmakeCommand);
 #ifdef Q_OS_WIN
     m_qmakeCommand = m_qmakeCommand.toLower();
 #endif
@@ -823,6 +824,7 @@ void QtVersion::updateVersionInfo() const
 {
     if (m_versionInfoUpToDate)
         return;
+
     // extract data from qmake executable
     m_versionInfo.clear();
     m_notInstalled = false;
@@ -937,7 +939,7 @@ void QtVersion::updateMkSpec() const
         mkspecPath = versionInfo().value("QT_INSTALL_DATA") + "/mkspecs/default";
     else
         mkspecPath = mkspecPath + "/default";
-//        qDebug() << "default mkspec is located at" << mkspecPath;
+//     qDebug() << "default mkspec is located at" << mkspecPath;
 #ifdef Q_OS_WIN
     QFile f2(mkspecPath + "/qmake.conf");
     if (f2.exists() && f2.open(QIODevice::ReadOnly)) {