Merge branch '1.0.0'

Conflicts:
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
	src/plugins/debugger/gdbengine.cpp

src/plugins/cpptools/cppcodecompletion.cpp

@@ -217,6 +217,8 @@ FunctionArgumentWidget::FunctionArgumentWidget()
 void FunctionArgumentWidget::showFunctionHint(Function *functionSymbol,
                                               const LookupContext &context)
 {
+    m_popupFrame->hide();
+
     m_item = functionSymbol;
     m_context = context;
     m_startpos = m_editor->position();
@@ -230,7 +232,7 @@ void FunctionArgumentWidget::showFunctionHint(Function *functionSymbol,
     m_popupFrame->move(pos);
     m_popupFrame->show();
 
-    QCoreApplication::instance()->installEventFilter(this);
+    qApp->installEventFilter(this);
 }
 
 void FunctionArgumentWidget::update()

src/plugins/qt4projectmanager/gdbmacrosbuildstep.cpp

@@ -124,7 +124,15 @@ void GdbMacrosBuildStep::run(QFutureInterface<bool> & fi)
         qmake.start(m_qmake, QStringList()<<"-spec"<<mkspec<<configarguments<<"gdbmacros.pro");
         qmake.waitForFinished();
 
-        qmake.start(qt4Project->qtVersion(m_buildConfiguration)->makeCommand(), makeArguments);
+        QString makeCmd = qt4Project->qtVersion(m_buildConfiguration)->makeCommand();
+        if (!value(m_buildConfiguration, "makeCmd").toString().isEmpty())
+            makeCmd = value(m_buildConfiguration, "makeCmd").toString();
+        if (!QFileInfo(makeCmd).isAbsolute()) {
+            // Try to detect command in environment
+            QString tmp = qt4Project->environment(m_buildConfiguration).searchInPath(makeCmd);
+            makeCmd = tmp;
+        }
+        qmake.start(makeCmd, makeArguments);
         qmake.waitForFinished();
 
         fi.reportResult(true);

src/plugins/qt4projectmanager/qtversionmanager.cpp

@@ -296,12 +296,13 @@ void QtVersionManager::updateSystemVersion()
     foreach (QtVersion *version, m_versions) {
         if (version->isSystemVersion()) {
             version->setPath(findSystemQt());
+            version->setName(tr("Auto-detected Qt"));
             haveSystemVersion = true;
         }
     }
     if (haveSystemVersion)
         return;
-    QtVersion *version = new QtVersion(tr("System Qt"),
+    QtVersion *version = new QtVersion(tr("Auto-detected Qt"),
                                        findSystemQt(),
                                        getUniqueId(),
                                        true);

src/plugins/texteditor/basetexteditor.cpp

@@ -3463,12 +3463,12 @@ void BaseTextEditor::unCollapseAll()
         if (TextBlockUserData::canCollapse(block))
             TextBlockUserData::doCollapse(block, makeVisible);
         block = block.next();
-
     }
 
     d->moveCursorVisible();
     documentLayout->requestUpdate();
     documentLayout->emitDocumentSizeChanged();
+    centerCursor();
 }
 
 void BaseTextEditor::setTextCodec(QTextCodec *codec)