diff options
author | hjk <hjk@qt.io> | 2018-05-30 14:33:06 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2018-05-30 13:04:12 +0000 |
commit | 829df213a481f63a54abe303be0c4f7e8f6f791b (patch) | |
tree | bd48e8ec6cd06d7ddf72b198e515f015fa101446 /src/plugins/qmljseditor | |
parent | 99631bcdb4f27a21cbc3ab2a84b6e72bb1c94e1c (diff) |
QmlJSEditor: Remove unused class QmlJSPreviewRunner
Change-Id: Ide6f2ba000e361545500da398740cc6b54efdc6d
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Diffstat (limited to 'src/plugins/qmljseditor')
-rw-r--r-- | src/plugins/qmljseditor/qmljseditor.pro | 2 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljseditor.qbs | 2 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljseditorplugin.cpp | 1 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljspreviewrunner.cpp | 79 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljspreviewrunner.h | 52 |
5 files changed, 0 insertions, 136 deletions
diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro index a4f79166118..549b174c49f 100644 --- a/src/plugins/qmljseditor/qmljseditor.pro +++ b/src/plugins/qmljseditor/qmljseditor.pro @@ -11,7 +11,6 @@ HEADERS += \ qmlexpressionundercursor.h \ qmljshighlighter.h \ qmljshoverhandler.h \ - qmljspreviewrunner.h \ qmljscomponentfromobjectdef.h \ qmljsoutline.h \ qmloutlinemodel.h \ @@ -39,7 +38,6 @@ SOURCES += \ qmlexpressionundercursor.cpp \ qmljshighlighter.cpp \ qmljshoverhandler.cpp \ - qmljspreviewrunner.cpp \ qmljscomponentfromobjectdef.cpp \ qmljsoutline.cpp \ qmloutlinemodel.cpp \ diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs index 9459876c9f9..a9d16c778c3 100644 --- a/src/plugins/qmljseditor/qmljseditor.qbs +++ b/src/plugins/qmljseditor/qmljseditor.qbs @@ -48,8 +48,6 @@ QtcPlugin { "qmljsoutline.h", "qmljsoutlinetreeview.cpp", "qmljsoutlinetreeview.h", - "qmljspreviewrunner.cpp", - "qmljspreviewrunner.h", "qmljsquickfix.cpp", "qmljsquickfix.h", "qmljsquickfixassist.cpp", diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 129b21f1c7f..474e2642ffb 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -30,7 +30,6 @@ #include "qmljseditorplugin.h" #include "qmljshighlighter.h" #include "qmljsoutline.h" -#include "qmljspreviewrunner.h" #include "qmljsquickfixassist.h" #include "qmltaskmanager.h" #include "quicktoolbar.h" diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.cpp b/src/plugins/qmljseditor/qmljspreviewrunner.cpp deleted file mode 100644 index 5d829098ec1..00000000000 --- a/src/plugins/qmljseditor/qmljspreviewrunner.cpp +++ /dev/null @@ -1,79 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "qmljspreviewrunner.h" - -#include <coreplugin/icore.h> - -#include <projectexplorer/runconfiguration.h> - -#include <utils/environment.h> -#include <utils/hostosinfo.h> -#include <utils/qtcprocess.h> -#include <utils/synchronousprocess.h> - -#include <QMessageBox> -#include <QApplication> - -namespace QmlJSEditor { -namespace Internal { - -QmlJSPreviewRunner::QmlJSPreviewRunner(QObject *parent) : - QObject(parent) -{ - // prepend creator/bin dir to search path (only useful for special creator-qml package) - const QString searchPath = QCoreApplication::applicationDirPath() - + Utils::HostOsInfo::pathListSeparator() - + QString::fromLocal8Bit(qgetenv("PATH")); - m_qmlViewerDefaultPath = Utils::SynchronousProcess::locateBinary(searchPath, QLatin1String("qmlviewer")); -} - -bool QmlJSPreviewRunner::isReady() const -{ - return !m_qmlViewerDefaultPath.isEmpty(); -} - -void QmlJSPreviewRunner::run(const QString &filename) -{ - QString errorMessage; - if (!filename.isEmpty()) { - ProjectExplorer::Runnable r; - r.environment = Utils::Environment::systemEnvironment(); - r.runMode = ProjectExplorer::ApplicationLauncher::Gui; - r.executable = m_qmlViewerDefaultPath; - r.commandLineArguments = Utils::QtcProcess::quoteArg(filename); - m_applicationLauncher.start(r); - } else { - errorMessage = tr("No file specified."); - } - - if (!errorMessage.isEmpty()) - QMessageBox::warning(Core::ICore::dialogParent(), tr("Failed to preview Qt Quick file"), - tr("Could not preview Qt Quick (QML) file. Reason:\n%1").arg(errorMessage)); -} - - -} // namespace Internal -} // namespace QmlJSEditor diff --git a/src/plugins/qmljseditor/qmljspreviewrunner.h b/src/plugins/qmljseditor/qmljspreviewrunner.h deleted file mode 100644 index 631311cb961..00000000000 --- a/src/plugins/qmljseditor/qmljspreviewrunner.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include <QObject> - -#include <projectexplorer/applicationlauncher.h> - -namespace QmlJSEditor { -namespace Internal { - -class QmlJSPreviewRunner : public QObject -{ - Q_OBJECT -public: - explicit QmlJSPreviewRunner(QObject *parent = 0); - - bool isReady() const; - void run(const QString &filename); - -private: - QString m_qmlViewerDefaultPath; - - ProjectExplorer::ApplicationLauncher m_applicationLauncher; - -}; - -} // namespace Internal -} // namespace QmlJSEditor |