forked from qt-creator/qt-creator
QmlJSEditor: Remove unused class QmlJSPreviewRunner
Change-Id: Ide6f2ba000e361545500da398740cc6b54efdc6d Reviewed-by: Marco Benelli <marco.benelli@qt.io>
This commit is contained in:
@@ -11,7 +11,6 @@ HEADERS += \
|
|||||||
qmlexpressionundercursor.h \
|
qmlexpressionundercursor.h \
|
||||||
qmljshighlighter.h \
|
qmljshighlighter.h \
|
||||||
qmljshoverhandler.h \
|
qmljshoverhandler.h \
|
||||||
qmljspreviewrunner.h \
|
|
||||||
qmljscomponentfromobjectdef.h \
|
qmljscomponentfromobjectdef.h \
|
||||||
qmljsoutline.h \
|
qmljsoutline.h \
|
||||||
qmloutlinemodel.h \
|
qmloutlinemodel.h \
|
||||||
@@ -39,7 +38,6 @@ SOURCES += \
|
|||||||
qmlexpressionundercursor.cpp \
|
qmlexpressionundercursor.cpp \
|
||||||
qmljshighlighter.cpp \
|
qmljshighlighter.cpp \
|
||||||
qmljshoverhandler.cpp \
|
qmljshoverhandler.cpp \
|
||||||
qmljspreviewrunner.cpp \
|
|
||||||
qmljscomponentfromobjectdef.cpp \
|
qmljscomponentfromobjectdef.cpp \
|
||||||
qmljsoutline.cpp \
|
qmljsoutline.cpp \
|
||||||
qmloutlinemodel.cpp \
|
qmloutlinemodel.cpp \
|
||||||
|
|||||||
@@ -48,8 +48,6 @@ QtcPlugin {
|
|||||||
"qmljsoutline.h",
|
"qmljsoutline.h",
|
||||||
"qmljsoutlinetreeview.cpp",
|
"qmljsoutlinetreeview.cpp",
|
||||||
"qmljsoutlinetreeview.h",
|
"qmljsoutlinetreeview.h",
|
||||||
"qmljspreviewrunner.cpp",
|
|
||||||
"qmljspreviewrunner.h",
|
|
||||||
"qmljsquickfix.cpp",
|
"qmljsquickfix.cpp",
|
||||||
"qmljsquickfix.h",
|
"qmljsquickfix.h",
|
||||||
"qmljsquickfixassist.cpp",
|
"qmljsquickfixassist.cpp",
|
||||||
|
|||||||
@@ -30,7 +30,6 @@
|
|||||||
#include "qmljseditorplugin.h"
|
#include "qmljseditorplugin.h"
|
||||||
#include "qmljshighlighter.h"
|
#include "qmljshighlighter.h"
|
||||||
#include "qmljsoutline.h"
|
#include "qmljsoutline.h"
|
||||||
#include "qmljspreviewrunner.h"
|
|
||||||
#include "qmljsquickfixassist.h"
|
#include "qmljsquickfixassist.h"
|
||||||
#include "qmltaskmanager.h"
|
#include "qmltaskmanager.h"
|
||||||
#include "quicktoolbar.h"
|
#include "quicktoolbar.h"
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -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
|
|
||||||
Reference in New Issue
Block a user