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

+<?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
-            \gui {Console} tab.
+        \li To execute JavaScript commands in the current context, open the
+            \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.
-
-            \image qtquick-example-property-values.png
+            in the \gui {QML/JS Console} and the code editor.
 
         \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

@@ -82,8 +82,9 @@ void NodeInstanceSignalSpy::registerObject(QObject *spiedObject, const PropertyN
 
              // search recursive in objects
              if (metaProperty.isReadable()
-                 && metaProperty.isWritable()
-                 && QQmlMetaType::isQObject(metaProperty.userType())) {
+                     && metaProperty.isWritable()
+                     && 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,22 +8,25 @@ QtcLibrary {
     Depends { name: "Qt.network" }
     cpp.includePaths: base.concat(".")
 
-    cpp.defines: base.concat("ZEROCONF_LIBRARY")
+    cpp.defines: {
+        var list = base;
+        list.push("ZEROCONF_LIBRARY");
+        if (qbs.targetOS === "linux") {
+            list.push(
+                "_GNU_SOURCE",
+                "HAVE_IPV6",
+                "USES_NETLINK",
+                "HAVE_LINUX",
+                "TARGET_OS_LINUX"
+            );
+        }
+        return list;
+    }
 
     Properties {
         condition: qbs.targetOS == "windows"
         cpp.dynamicLibraries:  "ws2_32"
     }
-    Properties {
-        condition: qbs.targetOS == "linux"
-        cpp.defines: base.concat([
-            "_GNU_SOURCE",
-            "HAVE_IPV6",
-            "USES_NETLINK",
-            "HAVE_LINUX",
-            "TARGET_OS_LINUX"
-        ])
-    }
 
     files: [
         "avahiLib.cpp",

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,7 +203,8 @@ DebuggerKitInformation::DebuggerItem DebuggerKitInformation::autoDetectItem(cons
 void DebuggerKitInformation::setup(Kit *k)
 {
     QTC_ASSERT(ToolChainManager::instance()->isLoaded(), return);
-    setDebuggerItem(k, autoDetectItem(k));
+    if (!isValidDebugger(k))
+        setDebuggerItem(k, autoDetectItem(k));
 }
 
 // Check the configuration errors and return a flag mask. Provide a quick check and