diff options
Diffstat (limited to 'src/plugins/qmlprojectmanager')
9 files changed, 20 insertions, 18 deletions
diff --git a/src/plugins/qmlprojectmanager/QmlProjectManager.json.in b/src/plugins/qmlprojectmanager/QmlProjectManager.json.in index b619ad643d..e0c9da4023 100644 --- a/src/plugins/qmlprojectmanager/QmlProjectManager.json.in +++ b/src/plugins/qmlprojectmanager/QmlProjectManager.json.in @@ -2,6 +2,7 @@ \"Name\" : \"QmlProjectManager\", \"Version\" : \"$$QTCREATOR_VERSION\", \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", + \"DisabledByDefault\" : true, \"Vendor\" : \"The Qt Company Ltd\", \"Copyright\" : \"(C) 2015 The Qt Company Ltd\", \"License\" : [ \"Commercial Usage\", diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp index de7e4abf81..5142197194 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp @@ -31,6 +31,7 @@ #include "filefilteritems.h" #include <utils/filesystemwatcher.h> +#include <utils/fileutils.h> #include <utils/qtcassert.h> #include <QDebug> @@ -179,7 +180,7 @@ bool FileFilterBaseItem::matchesFile(const QString &filePath) const return true; } - const QString &fileName = QFileInfo(filePath).fileName(); + const QString &fileName = Utils::FileName::fromString(filePath).fileName(); if (!fileMatches(fileName)) return false; diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp index 4bae8b3296..90180aaf7d 100644 --- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp +++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp @@ -89,8 +89,8 @@ Core::BaseFileWizard *QmlApplicationWizard::create(QWidget *parent, const Wizard { QmlApplicationWizardDialog *wizardDialog = new QmlApplicationWizardDialog(parent, parameters); - connect(wizardDialog, SIGNAL(projectParametersChanged(QString,QString)), m_qmlApp, - SLOT(setProjectNameAndBaseDirectory(QString,QString))); + connect(wizardDialog, &QmlApplicationWizardDialog::projectParametersChanged, + m_qmlApp, &QmlApp::setProjectNameAndBaseDirectory); wizardDialog->setPath(parameters.defaultPath()); diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index 1d22deed56..4647eede62 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -100,7 +100,7 @@ void QmlProject::addedTarget(ProjectExplorer::Target *target) void QmlProject::onActiveTargetChanged(ProjectExplorer::Target *target) { if (m_activeTarget) - disconnect(m_activeTarget, SIGNAL(kitChanged()), this, SLOT(onKitChanged())); + disconnect(m_activeTarget, &ProjectExplorer::Target::kitChanged, this, &QmlProject::onKitChanged); m_activeTarget = target; if (m_activeTarget) connect(target, SIGNAL(kitChanged()), this, SLOT(onKitChanged())); @@ -397,11 +397,9 @@ bool QmlProject::fromMap(const QVariantMap &map) foreach (Target *t, targets()) addedTarget(t); - connect(this, SIGNAL(addedTarget(ProjectExplorer::Target*)), - this, SLOT(addedTarget(ProjectExplorer::Target*))); + connect(this, &QmlProject::addedTarget, this, &QmlProject::addedTarget); - connect(this, SIGNAL(activeTargetChanged(ProjectExplorer::Target*)), - this, SLOT(onActiveTargetChanged(ProjectExplorer::Target*))); + connect(this, &QmlProject::activeTargetChanged, this, &QmlProject::onActiveTargetChanged); onActiveTargetChanged(activeTarget()); diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp index 90b3ff9496..801ef4b16e 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.cpp @@ -36,7 +36,7 @@ namespace QmlProjectManager { namespace Internal { -QmlProjectFile::QmlProjectFile(QmlProject *parent, QString fileName) +QmlProjectFile::QmlProjectFile(QmlProject *parent, const QString &fileName) : Core::IDocument(parent), m_project(parent) { @@ -44,7 +44,7 @@ QmlProjectFile::QmlProjectFile(QmlProject *parent, QString fileName) QTC_CHECK(!fileName.isEmpty()); setId("Qml.ProjectFile"); setMimeType(QLatin1String(Constants::QMLPROJECT_MIMETYPE)); - setFilePath(fileName); + setFilePath(Utils::FileName::fromString(fileName)); } QmlProjectFile::~QmlProjectFile() diff --git a/src/plugins/qmlprojectmanager/qmlprojectfile.h b/src/plugins/qmlprojectmanager/qmlprojectfile.h index 534c08f2a0..b9cbbfd9fe 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectfile.h +++ b/src/plugins/qmlprojectmanager/qmlprojectfile.h @@ -44,7 +44,7 @@ class QmlProjectFile : public Core::IDocument Q_OBJECT public: - QmlProjectFile(QmlProject *parent, QString fileName); + QmlProjectFile(QmlProject *parent, const QString &fileName); virtual ~QmlProjectFile(); virtual bool save(QString *errorString, const QString &fileName, bool autoSave); diff --git a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp index 878a79a1f3..bab143e8d4 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectnodes.cpp @@ -42,11 +42,11 @@ namespace QmlProjectManager { namespace Internal { QmlProjectNode::QmlProjectNode(QmlProject *project, Core::IDocument *projectFile) - : ProjectExplorer::ProjectNode(QFileInfo(projectFile->filePath()).absoluteFilePath()), + : ProjectExplorer::ProjectNode(projectFile->filePath().toString()), m_project(project), m_projectFile(projectFile) { - setDisplayName(QFileInfo(projectFile->filePath()).completeBaseName()); + setDisplayName(projectFile->filePath().toFileInfo().completeBaseName()); // make overlay const QSize desiredSize = QSize(16, 16); const QIcon projectBaseIcon(QLatin1String(":/qmlproject/images/qmlfolder.png")); @@ -63,7 +63,7 @@ Core::IDocument *QmlProjectNode::projectFile() const { return m_projectFile; } QString QmlProjectNode::projectFilePath() const -{ return m_projectFile->filePath(); } +{ return m_projectFile->filePath().toString(); } void QmlProjectNode::refresh() { diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index c5ccd6d104..46c9dffece 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -257,7 +257,7 @@ void QmlProjectRunConfiguration::changeCurrentFile(IEditor *editor) editor = EditorManager::currentEditor(); if (editor) - m_currentFileFilename = editor->document()->filePath(); + m_currentFileFilename = editor->document()->filePath().toString(); updateEnabled(); } @@ -267,7 +267,7 @@ void QmlProjectRunConfiguration::updateEnabled() if (mainScriptSource() == FileInEditor) { IDocument *document = EditorManager::currentDocument(); if (document) { - m_currentFileFilename = document->filePath(); + m_currentFileFilename = document->filePath().toString(); if (MimeDatabase::findByFile(mainScript()).type() == QLatin1String("application/x-qml")) qmlFileFound = true; } diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp index 47b03e70f5..dd1dc400ec 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfigurationwidget.cpp @@ -71,13 +71,15 @@ QmlProjectRunConfigurationWidget::QmlProjectRunConfigurationWidget(QmlProjectRun m_fileListCombo = new QComboBox; m_fileListCombo->setModel(m_fileListModel); - connect(m_fileListCombo, SIGNAL(activated(int)), this, SLOT(setMainScript(int))); + connect(m_fileListCombo, static_cast<void (QComboBox::*)(int)>(&QComboBox::activated), + this, &QmlProjectRunConfigurationWidget::setMainScript); connect(ProjectExplorer::ProjectExplorerPlugin::instance(), SIGNAL(fileListChanged()), SLOT(updateFileComboBox())); QLineEdit *qmlViewerArgs = new QLineEdit; qmlViewerArgs->setText(rc->m_qmlViewerArgs); - connect(qmlViewerArgs, SIGNAL(textChanged(QString)), this, SLOT(onViewerArgsChanged())); + connect(qmlViewerArgs, &QLineEdit::textChanged, + this, &QmlProjectRunConfigurationWidget::onViewerArgsChanged); form->addRow(tr("Arguments:"), qmlViewerArgs); form->addRow(tr("Main QML file:"), m_fileListCombo); |