summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2012-12-14 16:03:31 +0100
committerKai Koehne <kai.koehne@digia.com>2012-12-17 14:53:53 +0100
commit3306fda0e8b7614f3bbac2d4b9f7e55219df1936 (patch)
tree62a7e221057436a5c77491b9032c15126dbc7de5
parent74e61a6003eab1ac4e7daa8159ad4456464cf1ba (diff)
downloadqt-creator-3306fda0e8b7614f3bbac2d4b9f7e55219df1936.tar.gz
Add qmlscene to external tools menu
Task-number: QTCREATORBUG-7797 Change-Id: Icddb58db27f871c82468bf3a77bedc152ddf29cc Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
-rw-r--r--share/qtcreator/static.pro3
-rw-r--r--src/share/qtcreator/externaltools/qmlscene.xml43
-rw-r--r--src/share/qtcreator/externaltools/qmlviewer.xml2
-rw-r--r--src/share/share.qbs1
4 files changed, 47 insertions, 2 deletions
diff --git a/share/qtcreator/static.pro b/share/qtcreator/static.pro
index b707606bb1..891708b00f 100644
--- a/share/qtcreator/static.pro
+++ b/share/qtcreator/static.pro
@@ -95,7 +95,8 @@ DATA_FILES_SRC = \
externaltools/lrelease.xml \
externaltools/lupdate.xml \
externaltools/sort.xml \
- externaltools/qmlviewer.xml
+ externaltools/qmlviewer.xml \
+ externaltools/qmlscene.xml
unix {
macx:DATA_FILES_SRC += externaltools/vi_mac.xml
else:DATA_FILES_SRC += externaltools/vi.xml
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>
diff --git a/src/share/share.qbs b/src/share/share.qbs
index 3f2d437be1..b4f4f030e3 100644
--- a/src/share/share.qbs
+++ b/src/share/share.qbs
@@ -12,6 +12,7 @@ Product {
"lrelease.xml",
"lupdate.xml",
"qmlviewer.xml",
+ "qmlscene.xml",
"sort.xml",
]
}