Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80

2 files changed, 44 insertions, 1 deletions

diff --git a/src/share/qtcreator/externaltools/qmlscene.xml b/src/share/qtcreator/externaltools/qmlscene.xml
new file mode 100644
index 0000000000..a1b52f6215
--- /dev/null
+++ b/src/share/qtcreator/externaltools/qmlscene.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+-->
+<externaltool id="qmlscene">
+    <description>Runs the current QML file with qmlscene. This requires Qt 5.</description>
+    <displayname>Qt Quick 2 Preview (qmlscene)</displayname>
+    <category>Qt Quick</category>
+    <order>1</order>
+    <executable>
+        <path>%{CurrentProject:QT_INSTALL_BINS}/qmlscene</path>
+        <path>qmlscene</path>
+        <arguments>%{CurrentDocument:FilePath}</arguments>
+        <workingdirectory>%{CurrentDocument:Path}</workingdirectory>
+    </executable>
+</externaltool>
diff --git a/src/share/qtcreator/externaltools/qmlviewer.xml b/src/share/qtcreator/externaltools/qmlviewer.xml
index d0baf547fc..e174bedc0d 100644
--- a/src/share/qtcreator/externaltools/qmlviewer.xml
+++ b/src/share/qtcreator/externaltools/qmlviewer.xml
@@ -31,7 +31,7 @@
 -->
 <externaltool id="qmlviewer">
     <description>Runs the current QML file with qmlviewer</description>
-    <displayname>Preview (qmlviewer)</displayname>
+    <displayname>Qt Quick 1 Preview (qmlviewer)</displayname>
     <category>Qt Quick</category>
     <order>1</order>
     <executable>