Merge remote-tracking branch 'origin/2.7'

Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3

dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs

@@ -31,6 +31,7 @@
 function Component()
 {
     component.loaded.connect(this, Component.prototype.loaded);
+    installer.installationFinished.connect(this, Component.prototype.installationFinishedPageIsShown);
     installer.finishButtonClicked.connect(this, Component.prototype.installationFinished);
     installer.setDefaultPageVisible(QInstaller.ComponentSelection, false);
 }
@@ -173,6 +174,17 @@ Component.prototype.createOperations = function()
     }
 }
 
+Component.prototype.installationFinishedPageIsShown = function()
+{
+    try {
+        if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success) {
+            installer.addWizardPageItem( component, "LaunchQtCreatorCheckBoxForm", QInstaller.InstallationFinished );
+        }
+    } catch(e) {
+        print(e);
+    }
+}
+
 Component.prototype.installationFinished = function()
 {
     try {

dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LaunchQtCreatorCheckBoxForm</class>
+ <widget class="QWidget" name="LaunchQtCreatorCheckBoxForm">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>112</width>
+    <height>17</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QCheckBox" name="launchQtCreatorCheckBox">
+     <property name="text">
+      <string>Launch Qt Creator</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+     <property name="tristate">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in

@@ -14,5 +14,6 @@
     <AutoDependOn>org.qtproject.qtcreator</AutoDependOn>
     <UserInterfaces>
         <UserInterface>associatecommonfiletypesform.ui</UserInterface>
+        <UserInterface>launchqtcreatorcheckboxform.ui</UserInterface>
     </UserInterfaces>
 </Package>

doc/src/debugger/qtquick-debugger-example.qdoc

@@ -83,8 +83,8 @@
 
             \image qtquick-example-setting-breakpoint3.png
 
-        \li To execute JavaScript commands in the current context, select the
+        \li To execute JavaScript commands in the current context, open the
-            \gui {Console} tab.
+            \gui {QML/JS Console} output pane.
 
         \li To change the score to 1000, enter \c{gameCanvas.score = 1000}
             in the console.
@@ -108,15 +108,15 @@
             \inlineimage qml-inspector-select-button.png
             (\gui Select) to activate selection mode and then click the
             \gui {Quit} button to move into the \gui ButtonLabel component
-            in the \gui {Console} and the code editor.
+            in the \gui {QML/JS Console} and the code editor.
-
-            \image qtquick-example-property-values.png
 
         \li In the \gui {Locals and Expressions} view, double-click the value of
             the \c text property to change it temporarily from \gui {Quit} to
             \gui {End Game}.
 
-            When you select an item, the cursor moves to it in the code
+            \image qtquick-example-property-values.png
+
+            When you select an element, the cursor moves to it in the code
             editor, where you can change the value permanently.
 
     \endlist

doc/src/debugger/qtquick-debugging.qdoc

@@ -168,7 +168,7 @@
     \inlineimage qml-observer-bar-reload.png "Apply Changes on Save button"
     (\gui {Apply Changes on Save}) button on the toolbar.
 
-    When you change property values in the \gui {Console} or in the
+    When you change property values in the \gui {QML/JS Console} or in the
     \gui {Locals and Expressions} view, they are immediately updated in the running
     application, but not in the source code.
 

qtcreator.pro

@@ -21,11 +21,21 @@ OTHER_FILES += dist/copyright_template.txt \
     qbs/pluginspec/pluginspec.qbs
 
 qmake_cache = $$targetPath($$IDE_BUILD_TREE/.qmake.cache)
-unix: maybe_quote = \"
+equals(QMAKE_DIR_SEP, /): {
+    maybe_quote = "\""
+    maybe_backslash = "\\"
+}
 system("echo $${maybe_quote}$${LITERAL_HASH} config for qmake$${maybe_quote} > $$qmake_cache")
 # Make sure the qbs dll ends up alongside the Creator executable.
-win32:exists(src/shared/qbs/qbs.pro) {
+exists(src/shared/qbs/qbs.pro) {
     system("echo QBS_DLLDESTDIR = $${IDE_BUILD_TREE}/bin >> $$qmake_cache")
+    system("echo QBS_DESTDIR = $${maybe_backslash}\"$${IDE_LIBRARY_PATH}$${maybe_backslash}\" >> $$qmake_cache")
+    system("echo QBSLIBDIR = $${maybe_backslash}\"$${IDE_LIBRARY_PATH}$${maybe_backslash}\" >> $$qmake_cache")
+    system("echo QBS_INSTALL_PREFIX = $${QTC_PREFIX} >> $$qmake_cache")
+    system("echo QBS_LIB_INSTALL_DIR = $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator >> $$qmake_cache")
+    system("echo QBS_RESOURCES_BUILD_DIR = $${maybe_backslash}\"$${IDE_DATA_PATH}/qbs$${maybe_backslash}\" >> $$qmake_cache")
+    system("echo QBS_RESOURCES_INSTALL_DIR = $${QTC_PREFIX}/share/qtcreator/qbs >> $$qmake_cache")
+    system("echo CONFIG += qbs_no_dev_install >> $$qmake_cache")
 }
 
 contains(QT_ARCH, i386): ARCHITECTURE = x86

scripts/makedmg.sh

@@ -12,7 +12,7 @@ cp -a "${sourceFolder}/" "${intermediateFolder}"
 ln -s /Applications "${intermediateFolder}"
 cp "$(dirname "${BASH_SOURCE[0]}")/../LICENSE.LGPL" "${intermediateFolder}/LICENSE_LGPL.txt"
 echo Creating image...
-hdiutil create -srcfolder "${intermediateFolder}" -volname "${title}" -format UDBZ "${finalDMGName}" -ov -scrub
+hdiutil create -srcfolder "${intermediateFolder}" -volname "${title}" -format UDBZ "${finalDMGName}" -ov -scrub -stretch 1g
 
 # clean up
 rm -rf "${intermediateFolder}"

share/qtcreator/dumper/qttypes.py

@@ -2664,14 +2664,13 @@ def qdump__Eigen__Matrix(d, value):
     storage = value["m_storage"]
     options = numericTemplateArgument(value.type, 3)
     rowMajor = (int(options) & 0x1)
+    argRow = numericTemplateArgument(value.type, 1)
+    argCol = numericTemplateArgument(value.type, 2)
+    nrows = value["m_storage"]["m_rows"] if argRow == -1 else int(argRow)
+    ncols = value["m_storage"]["m_cols"] if argCol == -1 else int(argCol)
     p = storage["m_data"]
     if p.type.code == StructCode: # Static
-        nrows = numericTemplateArgument(value.type, 1)
-        ncols = numericTemplateArgument(value.type, 2)
         p = p["array"].cast(innerType.pointer())
-    else: # Dynamic
-        ncols = storage["m_cols"]
-        nrows = storage["m_rows"]
     d.putValue("(%s x %s), %s" % (nrows, ncols, ["ColumnMajor", "RowMajor"][rowMajor]))
     d.putField("keeporder", "1")
     d.putNumChild(nrows * ncols)

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp

@@ -83,7 +83,8 @@ void NodeInstanceSignalSpy::registerObject(QObject *spiedObject, const PropertyN
              // search recursive in objects
              if (metaProperty.isReadable()
                      && metaProperty.isWritable()
-                 && QQmlMetaType::isQObject(metaProperty.userType())) {
+                     && QQmlMetaType::isQObject(metaProperty.userType())
+                     && QLatin1String(metaProperty.name()) != QLatin1String("parent")) {
                  QObject *propertyObject = QQmlMetaType::toQObject(metaProperty.read(spiedObject));
                  if (propertyObject)
                      registerObject(propertyObject, prefix + metaProperty.name() + '/');

share/qtcreator/templates/qml/qtquick1_1/template.xml

@@ -4,5 +4,5 @@
     id="QB.QML Application for Qt Quick 1.1">
     <displayname>Qt Quick 1 UI</displayname>
     <displayname xml:lang="de">Qt Quick 1 UI</displayname>
-    <description>Creates a Qt Quick UI 1 project with a single QML file that contains the main view.&lt;br&gt; You can review Qt Quick UI 1 projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects. &lt;br&gt;&lt;br&gt;Requires &lt;b&gt;Qt 4.8&lt;/b&gt; or newer.</description>
+    <description>Creates a Qt Quick 1 UI project with a single QML file that contains the main view.&lt;br/&gt;You can review Qt Quick 1 UI projects in the QML Viewer and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects.&lt;br/&gt;&lt;br/&gt;Requires &lt;b&gt;Qt 4.8&lt;/b&gt; or newer.</description>
 </template>

share/qtcreator/templates/qml/qtquick2/template.xml

@@ -4,5 +4,5 @@
     id="QB.QML Application for Qt Quick 2.0">
     <displayname>Qt Quick 2 UI</displayname>
     <displayname xml:lang="de">Qt Quick 2 UI</displayname>
-    <description>Creates a Qt Quick UI 2 project with a single QML file that contains the main view.&lt;br&gt; You can review Qt Quick UI 2 projects in the QML Scene and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects.&lt;br&gt;&lt;br&gt;Requires &lt;b&gt;Qt 5.0&lt;/b&gt; or newer.</description>
+    <description>Creates a Qt Quick 2 UI project with a single QML file that contains the main view.&lt;br/&gt;You can review Qt Quick 2 UI projects in the QML Scene and you need not build them. You do not need to have the development environment installed on your computer to create and run this type of projects.&lt;br/&gt;&lt;br/&gt;Requires &lt;b&gt;Qt 5.0&lt;/b&gt; or newer.</description>
 </template>

share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.h

@@ -8,7 +8,7 @@
 namespace %PluginName% {
 namespace Internal {
 
-class %PluginName:u%SHARED_EXPORT %PluginName%Plugin : public ExtensionSystem::IPlugin
+class %PluginName%Plugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "%PluginName%.json")

src/libs/utils/pathchooser.cpp

@@ -250,7 +250,7 @@ PathChooser::PathChooser(QWidget *parent) :
     connect(d->m_lineEdit, SIGNAL(validChanged(bool)), this, SIGNAL(validChanged(bool)));
     connect(d->m_lineEdit, SIGNAL(editingFinished()), this, SIGNAL(editingFinished()));
 
-    d->m_lineEdit->setMinimumWidth(200);
+    d->m_lineEdit->setMinimumWidth(120);
     d->m_hLayout->addWidget(d->m_lineEdit);
     d->m_hLayout->setSizeConstraint(QLayout::SetMinimumSize);
 

src/libs/zeroconf/zeroconf.qbs

@@ -8,21 +8,24 @@ QtcLibrary {
     Depends { name: "Qt.network" }
     cpp.includePaths: base.concat(".")
 
-    cpp.defines: base.concat("ZEROCONF_LIBRARY")
+    cpp.defines: {
-
+        var list = base;
-    Properties {
+        list.push("ZEROCONF_LIBRARY");
-        condition: qbs.targetOS == "windows"
+        if (qbs.targetOS === "linux") {
-        cpp.dynamicLibraries:  "ws2_32"
+            list.push(
-    }
-    Properties {
-        condition: qbs.targetOS == "linux"
-        cpp.defines: base.concat([
                 "_GNU_SOURCE",
                 "HAVE_IPV6",
                 "USES_NETLINK",
                 "HAVE_LINUX",
                 "TARGET_OS_LINUX"
-        ])
+            );
+        }
+        return list;
+    }
+
+    Properties {
+        condition: qbs.targetOS == "windows"
+        cpp.dynamicLibraries:  "ws2_32"
     }
 
     files: [

src/plugins/cmakeprojectmanager/cmakevalidator.cpp

@@ -223,6 +223,8 @@ void CMakeValidator::parseFunctionDetailsOutput(const QByteArray &output)
     QList<QByteArray> cmakeCommandsHelp = output.split('\n');
     for (int i = 0; i < cmakeCommandsHelp.count(); ++i) {
         QByteArray lineTrimmed = cmakeCommandsHelp.at(i).trimmed();
+        if (cmakeFunctionsList.isEmpty())
+            break;
         if (cmakeFunctionsList.first().toLatin1() == lineTrimmed) {
             QStringList commandSyntaxes;
             QString currentCommandSyntax;
@@ -231,7 +233,7 @@ void CMakeValidator::parseFunctionDetailsOutput(const QByteArray &output)
             for (; i < cmakeCommandsHelp.count(); ++i) {
                 lineTrimmed = cmakeCommandsHelp.at(i).trimmed();
 
-                if (cmakeFunctionsList.first().toLatin1() == lineTrimmed) {
+                if (!cmakeFunctionsList.isEmpty() && cmakeFunctionsList.first().toLatin1() == lineTrimmed) {
                     //start of next function in output
                     if (!currentCommandSyntax.isEmpty())
                         commandSyntaxes << currentCommandSyntax.append(QLatin1String("</table>"));

src/plugins/coreplugin/vcsmanager.cpp

@@ -145,8 +145,12 @@ public:
 
         QString tmpDir = dir;
         const QChar slash = QLatin1Char('/');
-        while (tmpDir.count() >= topLevel.count() && tmpDir.count() > 0) {
+        while (tmpDir.count() >= topLevel.count() && !tmpDir.isEmpty()) {
             m_cachedMatches.insert(tmpDir, newInfo);
+            // if no vc was found, this might mean we're inside a repo internal directory (.git)
+            // Cache only input directory, not parents
+            if (!vc)
+                break;
             const int slashPos = tmpDir.lastIndexOf(slash);
             if (slashPos >= 0)
                 tmpDir.truncate(slashPos);

src/plugins/cpptools/cpptoolssettings.cpp

@@ -240,6 +240,11 @@ CppToolsSettings::~CppToolsSettings()
 {
     ExtensionSystem::PluginManager::removeObject(d->m_completionSettingsPage);
 
+    TextEditor::TextEditorSettings *textEditorSettings = TextEditor::TextEditorSettings::instance();
+    textEditorSettings->unregisterCodeStyle(Constants::CPP_SETTINGS_ID);
+    textEditorSettings->unregisterCodeStylePool(Constants::CPP_SETTINGS_ID);
+    textEditorSettings->unregisterCodeStyleFactory(Constants::CPP_SETTINGS_ID);
+
     delete d;
 
     m_instance = 0;

src/plugins/debugger/cdb/cdbengine.cpp

@@ -2402,6 +2402,9 @@ void CdbEngine::handleExtensionMessage(char t, int token, const QByteArray &what
         GdbMi gdbmi;
         gdbmi.fromString(message);
         exception.fromGdbMI(gdbmi);
+        // Don't show the Win32 x86 emulation subsystem breakpoint hit exception.
+        if (exception.exceptionCode == winExceptionWX86Breakpoint)
+            return;
         const QString message = exception.toString(true);
         showStatusMessage(message);
         // Report C++ exception in application output as well.

src/plugins/debugger/debuggerkitinformation.cpp

@@ -203,6 +203,7 @@ DebuggerKitInformation::DebuggerItem DebuggerKitInformation::autoDetectItem(cons
 void DebuggerKitInformation::setup(Kit *k)
 {
     QTC_ASSERT(ToolChainManager::instance()->isLoaded(), return);
+    if (!isValidDebugger(k))
         setDebuggerItem(k, autoDetectItem(k));
 }
 

src/plugins/debugger/debuggerplugin.cpp

@@ -1574,8 +1574,11 @@ void DebuggerPluginPrivate::onCurrentProjectChanged(Project *project)
     m_interruptAction->setEnabled(false);
     m_continueAction->setEnabled(false);
     m_exitAction->setEnabled(false);
-    m_startAction->setEnabled(true);
+    ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance();
-    m_debugWithoutDeployAction->setEnabled(true);
+    const bool canRun = pe->canRun(project, DebugRunMode);
+    m_startAction->setEnabled(canRun);
+    m_startAction->setToolTip(canRun ? QString() : pe->cannotRunReason(project, DebugRunMode));
+    m_debugWithoutDeployAction->setEnabled(canRun);
     setProxyAction(m_visibleStartAction, Core::Id(Constants::DEBUG));
 }
 

src/plugins/debugger/qml/qmlv8debuggerclient.cpp

@@ -1640,6 +1640,15 @@ void QmlV8DebuggerClient::setCurrentFrameDetails(const QVariant &bodyVal, const
     d->clearCache();
 
     const int frameIndex = stackHandler->currentIndex();
+    QSet<QByteArray> expandedInames = watchHandler->expandedINames();
+    QHash<quint64, QByteArray> handlesToLookup;
+    // Store handles of all expanded watch data
+    foreach (const QByteArray &iname, expandedInames) {
+        const WatchData *wd = watchHandler->findData(iname);
+        if (!wd || !wd->isLocal())
+            continue;
+        handlesToLookup.insert(wd->id, iname);
+    }
     watchHandler->removeAllData();
     if (frameIndex < 0)
         return;
@@ -1678,6 +1687,11 @@ void QmlV8DebuggerClient::setCurrentFrameDetails(const QVariant &bodyVal, const
         d->scope(scopeIndex);
     }
     d->engine->gotoLocation(stackHandler->currentFrame());
+
+    // Expand watch data that were previously expanded
+    QHash<quint64, QByteArray>::const_iterator itEnd = handlesToLookup.end();
+    for (QHash<quint64, QByteArray>::const_iterator it = handlesToLookup.begin(); it != itEnd; ++it)
+        expandObject(it.value(), it.key());
     emit stackFrameCompleted();
 }
 

src/plugins/diffeditor/differ.cpp

@@ -27,6 +27,14 @@
 **
 ****************************************************************************/
 
+/*
+The main algorithm "diffMyers()" is based on "An O(ND) Difference Algorithm
+and Its Variations" by Eugene W. Myers: http://www.xmailserver.org/diff2.pdf
+
+Preprocessing and postprocessing functions inspired by "Diff Strategies"
+publication by Neil Fraser: http://neil.fraser.name/writing/diff/
+*/
+
 #include "differ.h"
 
 #include <QList>

src/plugins/help/help.qbs

@@ -21,11 +21,15 @@ QtcPlugin {
     Depends { name: "app_version_header" }
 
     Depends { name: "cpp" }
-    Properties {
+
-        condition: qtcore.versionMajor >= 5
+    cpp.defines: {
-        cpp.defines: base.concat(["QT_NO_WEBKIT"])
+        var list = base;
+        if (qtcore.versionMajor >= 5)
+            list.push("QT_NO_WEBKIT");
+        list.push("QT_CLUCENE_SUPPORT");
+        return list;
     }
-    cpp.defines: base.concat("QT_CLUCENE_SUPPORT")
+
     cpp.includePaths: base.concat("../../shared/help")
 
     files: [

src/plugins/projectexplorer/kitmanager.cpp

@@ -191,7 +191,10 @@ void KitManager::restoreKits()
     }
 
     // read all kits from user file
-    KitList userKits = restoreKits(settingsFileName());
+    KitList userKits;
+    Utils::FileName userSettingsFile(settingsFileName());
+    if (userSettingsFile.toFileInfo().exists())
+        userKits = restoreKits(userSettingsFile);
     foreach (Kit *k, userKits.kits) {
         if (k->isSdkProvided())
             kitsToCheck.append(k);
@@ -255,8 +258,6 @@ void KitManager::restoreKits()
 
 KitManager::~KitManager()
 {
-    saveKits(); // Make sure we save the current state on exit!
-
     foreach (Kit *k, d->m_kitList)
         delete k;
     d->m_kitList.clear();

src/plugins/projectexplorer/msvctoolchain.cpp

@@ -384,7 +384,7 @@ bool MsvcToolChain::fromMap(const QVariantMap &data)
 {
     if (!ToolChain::fromMap(data))
         return false;
-    m_vcvarsBat = data.value(QLatin1String(varsBatKeyC)).toString();
+    m_vcvarsBat = QDir::fromNativeSeparators(data.value(QLatin1String(varsBatKeyC)).toString());
     m_varsBatArg = data.value(QLatin1String(varsBatArgKeyC)).toString();
     const QString abiString = data.value(QLatin1String(supportedAbiKeyC)).toString();
     m_abi = Abi(abiString);
@@ -422,7 +422,7 @@ void MsvcToolChainConfigWidget::setFromToolChain()
 {
     MsvcToolChain *tc = static_cast<MsvcToolChain *>(toolChain());
     QTC_ASSERT(tc, return);
-    QString varsBatDisplay = tc->varsBat();
+    QString varsBatDisplay = QDir::toNativeSeparators(tc->varsBat());
     if (!tc->varsBatArg().isEmpty()) {
         varsBatDisplay += QLatin1Char(' ');
         varsBatDisplay += tc->varsBatArg();

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -574,7 +574,7 @@ QString QbsProject::qbsBuildDir() const
     QString buildDir = Utils::Environment::systemEnvironment()
             .value(QLatin1String("QBS_BUILD_DIR"));
     if (buildDir.isEmpty())
-        buildDir = QLatin1String(QBS_BUILD_DIR);
+        buildDir = Core::ICore::resourcePath() + QLatin1String("/qbs");
     return buildDir;
 }
 

src/plugins/qbsprojectmanager/qbsprojectmanager.pro

@@ -9,10 +9,9 @@ include(qbsprojectmanager_dependencies.pri)
 QBS_SOURCE_DIR = $$PWD/../../shared/qbs
 QBS_BUILD_DIR = $$IDE_BUILD_TREE/src/shared/qbs
 
-QBSLIBDIR = $$QBS_BUILD_DIR/lib
 include($$QBS_SOURCE_DIR/src/lib/use.pri)
-linux-*:QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$$QBSLIBDIR\'
+# Mac: fix rpath for qbscore soname
-macx:QMAKE_LFLAGS += -Wl,-rpath,$$QBSLIBDIR
+macx:QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../
 
 QBS_BUILD_DIR_FWD_SLASHES = $$replace(QBS_BUILD_DIR, \\\\, /)
 DEFINES += QBS_BUILD_DIR=\\\"$$QBS_BUILD_DIR_FWD_SLASHES\\\"

src/plugins/qmljstools/qmljstoolssettings.cpp

@@ -159,6 +159,11 @@ QmlJSToolsSettings::QmlJSToolsSettings(QObject *parent)
 
 QmlJSToolsSettings::~QmlJSToolsSettings()
 {
+    TextEditor::TextEditorSettings *textEditorSettings = TextEditor::TextEditorSettings::instance();
+    textEditorSettings->unregisterCodeStyle(QmlJSTools::Constants::QML_JS_SETTINGS_ID);
+    textEditorSettings->unregisterCodeStylePool(QmlJSTools::Constants::QML_JS_SETTINGS_ID);
+    textEditorSettings->unregisterCodeStyleFactory(QmlJSTools::Constants::QML_JS_SETTINGS_ID);
+
     delete m_globalCodeStyle;
     m_globalCodeStyle = 0;
 }

src/plugins/qnx/qnxplugin.cpp

@@ -98,9 +98,7 @@ bool QNXPlugin::initialize(const QStringList &arguments, QString *errorString)
     barDescriptorMimeType.addMagicMatcher(QSharedPointer<Core::IMagicMatcher>(new BarDescriptorMagicMatcher));
     barDescriptorMimeType.setSubClassesOf(QStringList() << QLatin1String("application/xml"));
 
-    Core::ICore *core = Core::ICore::instance();
+    if (!Core::ICore::mimeDatabase()->addMimeType(barDescriptorMimeType)) {
-    Core::MimeDatabase *mdb = core->mimeDatabase();
-    if (!mdb->addMimeType(barDescriptorMimeType)) {
         *errorString = tr("Could not add mime-type for bar-descriptor.xml editor");
         return false;
     }

src/plugins/qt4projectmanager/makestep.cpp

@@ -196,7 +196,10 @@ bool MakeStep::init()
         QString makefile = subNode->makefile();
         if (makefile.isEmpty())
             makefile = QLatin1String("Makefile");
-        if (subNode->isDebugAndRelease()) {
+        // Use Makefile.Debug and Makefile.Release
+        // for file builds, since the rules for that are
+        // only in those files.
+        if (subNode->isDebugAndRelease() && bc->fileNodeBuild()) {
             if (bc->buildType() == Qt4BuildConfiguration::Debug)
                 makefile += QLatin1String(".Debug");
             else

src/plugins/qtsupport/baseqtversion.cpp

@@ -66,6 +66,9 @@ static const char QTVERSIONAUTODETECTED[] = "isAutodetected";
 static const char QTVERSIONAUTODETECTIONSOURCE []= "autodetectionSource";
 static const char QTVERSIONQMAKEPATH[] = "QMakePath";
 
+static const char MKSPEC_VALUE_LIBINFIX[] = "QT_LIBINFIX";
+static const char MKSPEC_VALUE_NAMESPACE[] = "QT_NAMESPACE";
+
 ///////////////
 // QtVersionNumber
 ///////////////
@@ -369,12 +372,14 @@ Utils::FileName QtSupport::BaseQtVersion::mkspecsPath() const
 
 QString QtSupport::BaseQtVersion::qtNamespace() const
 {
-    return qmakeProperty("QT_NAMESPACE");
+    ensureMkSpecParsed();
+    return m_mkspecValues.value(QLatin1String(MKSPEC_VALUE_NAMESPACE));
 }
 
 QString QtSupport::BaseQtVersion::qtLibInfix() const
 {
-    return qmakeProperty("QT_LIBINFIX");
+    ensureMkSpecParsed();
+    return m_mkspecValues.value(QLatin1String(MKSPEC_VALUE_LIBINFIX));
 }
 
 void BaseQtVersion::setId(int id)
@@ -833,9 +838,13 @@ void BaseQtVersion::parseMkSpec(ProFileEvaluator *evaluator) const
     const QString designerBins = QLatin1String("QT.designer.bins");
     const QString qmlBins = QLatin1String("QT.qml.bins");
     const QString declarativeBins = QLatin1String("QT.declarative.bins");
+    const QString libinfix = QLatin1String(MKSPEC_VALUE_LIBINFIX);
+    const QString ns = QLatin1String(MKSPEC_VALUE_NAMESPACE);
     m_mkspecValues.insert(designerBins, evaluator->value(designerBins));
     m_mkspecValues.insert(qmlBins, evaluator->value(qmlBins));
     m_mkspecValues.insert(declarativeBins, evaluator->value(declarativeBins));
+    m_mkspecValues.insert(libinfix, evaluator->value(libinfix));
+    m_mkspecValues.insert(ns, evaluator->value(ns));
 }
 
 FileName BaseQtVersion::mkspec() const
@@ -951,11 +960,15 @@ void BaseQtVersion::updateVersionInfo() const
         if (!fi.exists())
             m_installed = false;
     }
+    // Framework builds for Qt 4.8 don't use QT_INSTALL_HEADERS
+    // so we don't check on mac
+    if (!HostOsInfo::isMacHost()) {
         if (!qtHeaderData.isNull()) {
             const QFileInfo fi(qtHeaderData);
             if (!fi.exists())
                 m_installed = false;
         }
+    }
     const QString qtInstallDocs = qmakeProperty("QT_INSTALL_DOCS");
     if (!qtInstallDocs.isNull()) {
         const QFileInfo fi(qtInstallDocs);

src/plugins/texteditor/texteditorsettings.cpp

@@ -411,6 +411,11 @@ void TextEditorSettings::registerCodeStyleFactory(ICodeStylePreferencesFactory *
     m_d->m_languageToFactory.insert(factory->languageId(), factory);
 }
 
+void TextEditorSettings::unregisterCodeStyleFactory(Core::Id languageId)
+{
+    m_d->m_languageToFactory.remove(languageId);
+}
+
 QMap<Core::Id, ICodeStylePreferencesFactory *> TextEditorSettings::codeStyleFactories() const
 {
     return m_d->m_languageToFactory;
@@ -441,6 +446,11 @@ void TextEditorSettings::registerCodeStyle(Core::Id languageId, ICodeStylePrefer
     m_d->m_languageToCodeStyle.insert(languageId, prefs);
 }
 
+void TextEditorSettings::unregisterCodeStyle(Core::Id languageId)
+{
+    m_d->m_languageToCodeStyle.remove(languageId);
+}
+
 CodeStylePool *TextEditorSettings::codeStylePool() const
 {
     return m_d->m_behaviorSettingsPage->codeStylePool();
@@ -456,6 +466,11 @@ void TextEditorSettings::registerCodeStylePool(Core::Id languageId, CodeStylePoo
     m_d->m_languageToCodeStylePool.insert(languageId, pool);
 }
 
+void TextEditorSettings::unregisterCodeStylePool(Core::Id languageId)
+{
+    m_d->m_languageToCodeStylePool.remove(languageId);
+}
+
 void TextEditorSettings::registerMimeTypeForLanguageId(const QString &mimeType, Core::Id languageId)
 {
     m_d->m_mimeTypeToLanguage.insert(mimeType, languageId);

src/plugins/texteditor/texteditorsettings.h

@@ -92,15 +92,18 @@ public:
     ICodeStylePreferencesFactory *codeStyleFactory(Core::Id languageId) const;
     QMap<Core::Id, ICodeStylePreferencesFactory *> codeStyleFactories() const;
     void registerCodeStyleFactory(ICodeStylePreferencesFactory *codeStyleFactory);
+    void unregisterCodeStyleFactory(Core::Id languageId);
 
     CodeStylePool *codeStylePool() const;
     CodeStylePool *codeStylePool(Core::Id languageId) const;
     void registerCodeStylePool(Core::Id languageId, CodeStylePool *pool);
+    void unregisterCodeStylePool(Core::Id languageId);
 
     ICodeStylePreferences *codeStyle() const;
     ICodeStylePreferences *codeStyle(Core::Id languageId) const;
     QMap<Core::Id, ICodeStylePreferences *> codeStyles() const;
     void registerCodeStyle(Core::Id languageId, ICodeStylePreferences *prefs);
+    void unregisterCodeStyle(Core::Id languageId);
 
     void registerMimeTypeForLanguageId(const QString &mimeType, Core::Id languageId);
     Core::Id languageId(const QString &mimeType) const;

src/qtcreatorlibrary.pri

@@ -19,9 +19,10 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
 !macx {
     win32 {
-        target.path = $$QTC_PREFIX/bin
+        dlltarget.path = $$QTC_PREFIX/bin
+        INSTALLS += dlltarget
     } else {
         target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator
-    }
         INSTALLS += target
     }
+}

src/shared/qtlockedfile/qtlockedfile_unix.cpp

@@ -95,6 +95,7 @@ bool QtLockedFile::unlock()
     }
 
     m_lock_mode = NoLock;
+    remove();
     return true;
 }
 

src/shared/qtlockedfile/qtlockedfile_win.cpp

@@ -167,6 +167,7 @@ bool QtLockedFile::unlock()
     }
 
     m_lock_mode = QtLockedFile::NoLock;
+    remove();
     return true;
 }
 

tests/manual/debugger/qquick2/app.pro

@@ -1,4 +1,4 @@
-QT += declarative quick
+QT += qml quick
 
 macx:CONFIG -= app_bundle
 

tests/manual/debugger/qquick2/main.cpp

@@ -1,7 +1,7 @@
 #include <QGuiApplication>
 #include <QQuickView>
-#include <QDeclarativeContext>
+#include <QQmlContext>
-#include <QDeclarativeEngine>
+#include <QQmlEngine>
 #include <QDebug>
 
 class Backend : public QObject {

tests/manual/debugger/qquick2/myplugin/myplugin.cpp

@@ -1,6 +1,8 @@
 #include "myplugin.h"
 #include "mytype.h"
 
+#include <qqml.h>
+
 void MyPlugin::registerTypes(const char *uri)
 {
     // @uri mymodule
@@ -8,4 +10,3 @@ void MyPlugin::registerTypes(const char *uri)
     qmlRegisterType<MyType>(uri, 1, 0, "MyType");
 }
 
-Q_EXPORT_PLUGIN(MyPlugin)

tests/manual/debugger/qquick2/myplugin/myplugin.h

@@ -1,13 +1,12 @@
 #ifndef MYPLUGIN_H
 #define MYPLUGIN_H
 
-#include <qdeclarative.h>
+#include <QQmlExtensionPlugin>
-#include <QDeclarativeExtensionPlugin>
 
-class MyPlugin : public QDeclarativeExtensionPlugin
+class MyPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
-
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
 public:
     void registerTypes(const char *uri);
 };

tests/manual/debugger/qquick2/myplugin/myplugin.pro

@@ -1,6 +1,6 @@
 TEMPLATE = lib
 TARGET = myplugin
-QT += declarative
+QT += qml
 CONFIG += qt plugin
 
 TARGET = $$qtLibraryTarget($$TARGET)

tests/manual/debugger/qquick2/myplugin/mytype.cpp

@@ -1,8 +1,8 @@
+#include "mytype.h"
+
 #include <QTimer>
 #include <QTime>
-#include <qdeclarative.h>
+#include <qqml.h>
-
-#include "mytype.h"
 
 MyType::MyType(QObject *parent)
     : QObject(parent)

tests/manual/debugger/qquick2/myplugin/qmldir

@@ -1 +1,2 @@
+module myplugin
 plugin myplugin

tests/system/shared/hook_utils.py

@@ -111,6 +111,7 @@ def modifyRunSettingsForHookIntoQtQuickUI(kitCount, workingDir, projectName, por
     if platform.system() == "Darwin":
         __addVariableToRunEnvironment__("DYLD_FRAMEWORK_PATH", qtLibPath)
     if not platform.system() in ('Microsoft', 'Windows'):
+        if not os.getenv("DISPLAY"):
             __addVariableToRunEnvironment__("DISPLAY", ":0.0")
     result = qmlViewer
     switchViewTo(ViewConstants.EDIT)

tests/system/shared/utils.py

@@ -291,7 +291,7 @@ def __checkParentAccess__(filePath):
 # this function checks for all configured Qt versions inside
 # options dialog and returns a dict holding the kits as keys
 # and a list of information of its configured Qt
-def getConfiguredKits(isMaddedDisabled=True):
+def getConfiguredKits(isMaddeDisabled=True):
     def __retrieveQtVersionName__(target, version):
         treeWidget = waitForObject(":QtSupport__Internal__QtVersionManager.qtdirList_QTreeWidget")
         return treeWidget.currentItem().text(0)
@@ -311,7 +311,7 @@ def getConfiguredKits(isMaddedDisabled=True):
     iterateKits(True, True, __setQtVersionForKit__, kitsWithQtVersionName)
     # merge defined target names with their configured Qt versions and devices
     for kit, qtVersion in kitsWithQtVersionName.iteritems():
-        if isMaddedDisabled and  kit in ('Fremantle', 'Harmattan') and qtVersion == 'None':
+        if isMaddeDisabled and kit in ('Fremantle', 'Harmattan') and qtVersion == 'None':
                 test.log("Found Kit '%s' with unassigned Qt version (disabled Madde plugin)" % kit)
         elif qtVersion in qtVersionNames:
             result[kit] = targetsQtVersions[qtVersionNames.index(qtVersion)].items()[0]

tests/system/suite_editors/tst_memberoperator/test.py

@@ -16,11 +16,9 @@ def main():
         placeCursorToLine(cppwindow, "return a.exec();")
         typeLines(cppwindow, ("<Up>", testData.field(record, "declaration")))
         type(cppwindow, testData.field(record, "usage"))
-        waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}",
+        snooze(1) # maybe find something better
-                      "sourceFilesRefreshed(QStringList)")
         type(cppwindow, testData.field(record, "operator"))
-        waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}",
+        waitFor("object.exists(':popupFrame_TextEditor::GenericProposalWidget')", 1500)
-                      "sourceFilesRefreshed(QStringList)")
         test.compare(str(lineUnderCursor(cppwindow)).strip(), testData.field(record, "expected"))
         invokeMenuItem("File", 'Revert "main.cpp" to Saved')
         clickButton(waitForObject(":Revert to Saved.Proceed_QPushButton"))