Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb

dist/changes-3.3.1

@@ -0,0 +1,50 @@
+Qt Creator version 3.3.1 contains bug fixes.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+git clone git://gitorious.org/qt-creator/qt-creator.git
+git log --cherry-pick --pretty=oneline v3.3.0..v3.3.1
+
+Editing
+   * Fixed crash with some highlighting files (QTCREATORBUG-13883)
+
+CMake Projects
+   * Fixed include completion (QTCREATORBUG-13567)
+   * Fixed highlighting for CMake files (QTCREATORBUG-13588)
+
+C++ Support
+   * Fixed comment continuation (QTCREATORBUG-13415)
+   * Fixed Convert to Pointer refactoring action for auto variables
+     (QTCREATORBUG-13605)
+   * Fixed that triggering refactoring actions from the context menu
+     worked only if the text cursor was set first (QTCREATORBUG-13388)
+   * Fixed crash if no kits are available (QTCREATORBUG-13730)
+   * Fixed infinite loop when parsing some files (QTCREATORBUG-13703)
+   * Fixed crash when #if nesting is deeper than 512 levels
+
+Version Control Systems
+   * Git
+      * Fixed reverting chunks in diff viewer when diff.mnemonicprefix is set
+        (QTCREATORBUG-13782)
+   * ClearCase
+      * Fixed that check out was requested even though the file was already
+        checked out (QTCREATORBUG-13782)
+
+Code Pasting
+   * Fixed pasting to pastebin.ca (QTCREATORBUG-13802)
+
+Platform Specific
+
+OS X
+   * Fixed dropping files from Finder onto Qt Creator (QTBUG-40449)
+
+Android
+   * Fixed crash when removing auto-detected kits (QTCREATORBUG-13736)
+   * Fixed debugging applications that link many modules (QTCREATORBUG-13691)
+
+WinRT
+   * Fixed installing custom files into package root (QTCREATORBUG-13835)
+   * Fixed occasional crashes when debugging
+

dist/known-issues

@@ -1,6 +1,6 @@
 The Qt Creator Manual lists known issues in Qt Creator:
 
-http://qt-project.org/doc/qtcreator/creator-known-issues.html
+http://doc.qt.io/qtcreator/creator-known-issues.html
 
 For a complete list of reported issues, see the Qt Bug Tracker:
 

doc/api/coding-style.qdoc

@@ -891,7 +891,7 @@
             for signals and slots inside connect statements to safely make
             signal and slot lookup a few cycles faster. You can use
             $QTDIR/util/normalize to normalize existing code. For more
-            information, see \l{http://qt-project.org/doc/qt-4.8/qmetaobject.html#normalizedSignature}{QMetaObject::normalizedSignature}.
+            information, see QMetaObject::normalizedSignature.
     \endlist
 
     \section2 File Headers

doc/api/first-plugin.qdoc

@@ -227,7 +227,7 @@
     for use in \QC, by using the information you gave above.
 
     For more information about qmake, and writing .pro files in general,
-    see the \l{http://qt-project.org/doc/qt-4.8/qmake-manual.html}{qmake Manual}.
+    see the \l{qmake Manual}.
 
     \section1 Plugin Meta Data Template
 

doc/api/qtcreator-dev-wizards.qdoc

@@ -23,7 +23,7 @@
     \section1 Introduction
 
     If the functionality provided by template-based
-    \l{http://doc.qt.digia.com/qtcreator-snapshot/creator-project-wizards.html}{custom wizards}
+    \l{http://doc.qt.io/qtcreator/creator-project-wizards.html}{custom wizards}
     is not sufficient for your case, you can write wizards in code.
 
     A wizard in Qt Creator is an instance of a class implementing

doc/api/qtcreator-dev.qdoc

@@ -53,7 +53,7 @@
     to which you can add your own snippets.
 
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-completing-code.html#editing-code-snippets}
+    \li \l{http://doc.qt.io/qtcreator/creator-completing-code.html#editing-code-snippets}
          {Snippets User Interface}
     \li \l{Snippets} {Adding Snippets Groups}
     \endlist
@@ -64,7 +64,7 @@
     own
     file and project templates by writing XML definition files for them.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-project-wizards.html}
+    \li \l{http://doc.qt.io/qtcreator/creator-project-wizards.html}
          {Adding New Custom Wizards}
     \li \l{User Interface Text Guidelines}
     \endlist
@@ -96,7 +96,7 @@
     the MIME type definitions in Qt Creator to your specific setup,
     by adding or removing file extensions and specifying magic headers.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-mime-types.html}
+    \li \l{http://doc.qt.io/qtcreator/creator-mime-types.html}
          {Editing MIME Types}
     \li \l{http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html}
          {MIME Type Specification Files}
@@ -110,7 +110,7 @@
     provided by the Kate Editor. You can download highlight definition files
     for use with Qt Creator and create your own definition files.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-editor-options.html#generic-highlighting}
+    \li \l{http://doc.qt.io/qtcreator/creator-editor-options.html#generic-highlighting}
          {Generic Highlighting}
     \li \l{http://kate-editor.org/2005/03/24/writing-a-syntax-highlighting-file/}
          {Writing a Syntax Highlighting File}
@@ -162,7 +162,7 @@
     to fill a feature suggestion.
     The tool descriptions are saved as XML files that you can share.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-editor-external.html}
+    \li \l{http://doc.qt.io/qtcreator/creator-editor-external.html}
          {Using External Tools}
     \li \l{External Tool Specification Files}
     \endlist
@@ -189,7 +189,7 @@
     If you need a way to configure the tool in Qt Creator, you can add an
     \uicontrol Options page for it.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-editor-external.html}
+    \li \l{http://doc.qt.io/qtcreator/creator-editor-external.html}
          {Using External Tools}
     \li \l{External Tool Specification Files}
     \li \l{Creating Plugins}
@@ -214,7 +214,7 @@
     the \uicontrol {Issues} output
     pane.
     \list
-    \li \l{http://doc.qt.digia.com/qtcreator/creator-task-lists.html}
+    \li \l{http://doc.qt.io/qtcreator/creator-task-lists.html}
          {Showing Task List Files in the Issues Pane}
     \li \l{Creating Plugins}
     \li \l{Qt Creator Coding Rules}

doc/api/qtcreator-documentation.qdoc

@@ -61,7 +61,7 @@
     \section1 Configuring the Documentation Project
 
     \QC documentation is written by using QDoc. For more information about using
-    QDoc, see the \l{http://qt-project.org/doc/qt-5.1/qdoc/qdoc-index.html}
+    QDoc, see the \l{http://doc.qt.io/qt-5/qdoc-index.html}
     {QDoc Manual}.
 
     QDoc finds the new topics automatically, when you place them as .qdoc files
@@ -299,7 +299,7 @@
     on OS X. You can view the HTML files in a browser and the help files in
     the \QC \uicontrol Help mode. For more information about adding the help files to
     \QC, see
-    \l{http://qt-project.org/doc/qtcreator/creator-help.html#adding-external-documentation}
+    \l{http://doc.qt.io/qtcreator/creator-help.html#adding-external-documentation}
     {Adding External Documentation}.
 
     Besides \c docs, you have the following options:

doc/config/qtcreator-project.qdocconf

@@ -1,6 +1,6 @@
 project     = "QtCreator"
 description = "Qt Creator Manual"
-url         = http://qt-project.org/doc/qtcreator
+url         = http://doc.qt.io/qtcreator
 
 headerdirs =
 sourcedirs = $SRCDIR/src

doc/src/projects/creator-projects-qbs.qdoc

@@ -27,7 +27,7 @@
     To use Qbs to build a project, you must create a .qbs file for the project.
     You can use \QC to create a C or C++ project that is built with Qbs.
     For more information about Qbs, see
-    the \l{http://qt-project.org/doc/qbs/index.html}{Qbs Manual}.
+    the \l{http://doc.qt.io/qbs/index.html}{Qbs Manual}.
 
     \section1 Building Qbs
 
@@ -89,7 +89,7 @@
                 \li In the \uicontrol Properties field, specify the properties to pass
                     to the project. Use colons (:) to separate keys from values.
                     For more information, see
-                    \l{http://qt-project.org/doc/qbs/language-introduction.html}
+                    \l{http://doc.qt.io/qbs/language-introduction.html}
                     {Modules} in the Qbs Manual.
 
                 \li In the \uicontrol Flags field:

doc/src/projects/creator-projects-settings-build.qdoc

@@ -114,7 +114,7 @@
     the build step and add a custom build step that specifies another shell
     command.
 
-    \QC is integrated to \l{http://doc.qt.digia.com/QtQuickCompiler/}
+    \QC is integrated to \l{http://doc.qt.io/QtQuickCompiler/}
     {Qt Quick Compiler} (commercial only) that enables you to compile QML source
     code into the final binary. This
     improves the startup time of the application and eliminates the need to

share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml

@@ -35,6 +35,6 @@ DummyContextObject {
     property variant model: QtObject {
         property string name: "Calculator"
         property string description: "his demo shows how to write a simple calculator application in QML and JavaScript."
-        property string imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-calculator-example-small.png"
+        property string imageSource: "http://doc.qt.io/qt-4.8/images/qml-calculator-example-small.png"
     }
 }

share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml

@@ -34,27 +34,27 @@ ListModel {
     ListElement {
         name: "Calculator with more info on something bla bla on Qt if you know"
         description: "his demo shows how to write a simple calculator application in QML and JavaScript."
-        imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-calculator-example-small.png"
+        imageSource: "http://doc.qt.io/qt-4.8/images/qml-calculator-example-small.png"
     }
     ListElement {
         name: "RSS News Reader"
         description: "This demo shows how to write a RSS news reader in QML."
-        imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-rssnews-demo-small.png"
+        imageSource: "http://doc.qt.io/qt-4.8/images/qml-rssnews-demo-small.png"
     }
     ListElement {
         name: "Twitter"
         description: "This demo shows how to write a mobile Twitter search client in QML. Use it to see what people think about Qt Quick!"
-        imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-twitter-demo-small.png"
+        imageSource: "http://doc.qt.io/qt-4.8/images/qml-twitter-demo-small.png"
     }
     ListElement {
         name: "Basic Drawing Example"
         description: "The Basic Drawing example shows how to display basic graphics primitives in a variety of styles using the QPainter class."
-        imageSource: "http://qt-project.org/doc/qt-4.8/images/basicdrawing-example.png"
+        imageSource: "http://doc.qt.io/qt-4.8/images/basicdrawing-example.png"
     }
 
     ListElement {
         name: "Border Layout Example"
         description: "The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules. The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules. The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules. The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules."
-        imageSource: "http://qt-project.org/doc/qt-4.8/images/borderlayout-example.png"
+        imageSource: "http://doc.qt.io/qt-4.8/images/borderlayout-example.png"
     }
 }

src/plugins/help/helpplugin.cpp

@@ -635,7 +635,7 @@ void HelpPlugin::handleHelpRequest(const QUrl &url, HelpManager::HelpViewerLocat
             || address.startsWith(QLatin1String("qthelp://com.nokia."))
             || address.startsWith(QLatin1String("qthelp://com.trolltech."))) {
                 // local help not installed, resort to external web help
-                QString urlPrefix = QLatin1String("http://qt-project.org/doc/");
+                QString urlPrefix = QLatin1String("http://doc.qt.io/");
                 if (url.authority() == QLatin1String("org.qt-project.qtcreator"))
                     urlPrefix.append(QString::fromLatin1("qtcreator"));
                 else

src/plugins/projectexplorer/msvctoolchain.cpp

@@ -586,9 +586,12 @@ QList<ToolChain *> MsvcToolChainFactory::autoDetect()
         const QString vcvarsAllbat = path + QLatin1String("/vcvarsall.bat");
         if (QFileInfo(vcvarsAllbat).isFile()) {
             QList<MsvcToolChain::Platform> platforms; // prioritized list
+            // x86_arm was put before amd64_arm as a workaround for auto detected windows phone
+            // toolchains. As soon as windows phone builds support x64 cross builds, this change
+            // can be reverted.
             platforms << MsvcToolChain::x86
                       << MsvcToolChain::amd64 << MsvcToolChain::x86_amd64
-                      << MsvcToolChain::arm << MsvcToolChain::amd64_arm << MsvcToolChain::x86_arm
+                      << MsvcToolChain::arm << MsvcToolChain::x86_arm << MsvcToolChain::amd64_arm
                       << MsvcToolChain::ia64 << MsvcToolChain::x86_ia64;
             foreach (const MsvcToolChain::Platform &platform, platforms) {
                 if (hostSupportsPlatform(platform)

src/plugins/qtsupport/qtversionmanager.cpp

@@ -351,7 +351,7 @@ void QtVersionManager::updateFromInstaller(bool emitSignal)
                     qDebug() << " Qt version found with same autodetection source" << autoDetectionSource << " => Migrating id:" << id;
                 m_versions.remove(id);
                 qtversionMap[QLatin1String(Constants::QTVERSIONID)] = id;
-                qtversionMap[QLatin1String(Constants::QTVERSIONNAME)] = v->displayName();
+                qtversionMap[QLatin1String(Constants::QTVERSIONNAME)] = v->unexpandedDisplayName();
                 delete v;
 
                 if (BaseQtVersion *qtv = factory->restore(type, qtversionMap)) {