From 921f86dfa748468a8d7e6bb7787aed8fb8b53da9 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Tue, 13 Aug 2013 10:52:57 +0200
Subject: [PATCH] TargetSetupPage: Generalize the page
Generalize the target setup page and move it into projectexplorer
Move the qmake specific code into a projectimporter class with
a specialization for qmake projects in the qt4projectmanager.
This change depends heavily on the BuildConfigurationFactory cleanups
done earlier and completes that change in such a way that generic
build configuration factories are now in theory possible. The
remaining problem is how to select the best factory of several that
claim to be able to handle a kit and that is left for the next patch.
Change-Id: I47134cb1938c52adebcdc1ddfe8dbf26abbbbeee
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
.../autotoolsbuildconfiguration.cpp | 19 +
.../autotoolsbuildconfiguration.h | 3 +
.../cmakebuildconfiguration.cpp | 26 +-
.../cmakebuildconfiguration.h | 3 +
.../cmakeprojectmanager/cmakeproject.h | 4 +-
.../genericbuildconfiguration.cpp | 17 +
.../genericbuildconfiguration.h | 3 +
.../projectexplorer/buildconfiguration.cpp | 12 +
.../projectexplorer/buildconfiguration.h | 7 +
.../buildsettingspropertiespage.cpp | 6 +-
.../buildsettingspropertiespage.h | 2 +-
.../importwidget.cpp | 4 +-
.../importwidget.h | 4 +-
src/plugins/projectexplorer/project.cpp | 11 +-
src/plugins/projectexplorer/project.h | 5 +
.../projectexplorer/projectexplorer.cpp | 4 +-
.../projectexplorer/projectexplorer.pro | 10 +
.../projectexplorer/projectexplorer.qbs | 8 +-
.../projectexplorerconstants.h | 3 +
.../projectexplorer/projectimporter.cpp | 130 ++++
src/plugins/projectexplorer/projectimporter.h | 78 ++
src/plugins/projectexplorer/target.cpp | 2 +-
.../projectexplorer/targetsetuppage.cpp | 531 +++++++++++++
.../targetsetuppage.h | 64 +-
.../targetsetupwidget.cpp} | 166 ++--
.../targetsetupwidget.h} | 52 +-
.../unconfiguredprojectpanel.cpp | 57 +-
.../unconfiguredprojectpanel.h | 22 +-
.../qbsbuildconfiguration.cpp | 27 +
.../qbsprojectmanager/qbsbuildconfiguration.h | 3 +
.../qt4projectmanager/qmakebuildinfo.h | 11 +
.../qmakeprojectimporter.cpp | 254 ++++++
...igurationinfo.h => qmakeprojectimporter.h} | 52 +-
.../qt4buildconfiguration.cpp | 158 ++--
.../qt4projectmanager/qt4buildconfiguration.h | 15 +-
src/plugins/qt4projectmanager/qt4project.cpp | 56 +-
src/plugins/qt4projectmanager/qt4project.h | 7 +-
.../qt4projectmanager/qt4projectmanager.pro | 15 +-
.../qt4projectmanager/qt4projectmanager.qbs | 3 -
.../qt4projectmanagerconstants.h | 3 -
.../qt4projectmanagerplugin.cpp | 2 -
.../wizards/abstractmobileappwizard.cpp | 10 +-
.../wizards/abstractmobileappwizard.h | 7 +-
.../wizards/html5appwizard.cpp | 4 +-
.../wizards/qtquickappwizard.cpp | 6 +-
.../qt4projectmanager/wizards/qtwizard.cpp | 6 +-
.../qt4projectmanager/wizards/qtwizard.h | 8 +-
.../wizards/targetsetuppage.cpp | 731 ------------------
48 files changed, 1487 insertions(+), 1144 deletions(-)
rename src/plugins/{qt4projectmanager/wizards => projectexplorer}/importwidget.cpp (98%)
rename src/plugins/{qt4projectmanager/wizards => projectexplorer}/importwidget.h (96%)
create mode 100644 src/plugins/projectexplorer/projectimporter.cpp
create mode 100644 src/plugins/projectexplorer/projectimporter.h
create mode 100644 src/plugins/projectexplorer/targetsetuppage.cpp
rename src/plugins/{qt4projectmanager/wizards => projectexplorer}/targetsetuppage.h (67%)
rename src/plugins/{qt4projectmanager/qt4targetsetupwidget.cpp => projectexplorer/targetsetupwidget.cpp} (64%)
rename src/plugins/{qt4projectmanager/qt4targetsetupwidget.h => projectexplorer/targetsetupwidget.h} (69%)
rename src/plugins/{qt4projectmanager => projectexplorer}/unconfiguredprojectpanel.cpp (77%)
rename src/plugins/{qt4projectmanager => projectexplorer}/unconfiguredprojectpanel.h (82%)
create mode 100644 src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
rename src/plugins/qt4projectmanager/{buildconfigurationinfo.h => qmakeprojectimporter.h} (54%)
delete mode 100644 src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
index c0ba3d7ac31..b09a1b156f8 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
@@ -104,6 +104,24 @@ QList<BuildInfo *> AutotoolsBuildConfigurationFactory::availableBuilds(const Tar
return result;
}
+bool AutotoolsBuildConfigurationFactory::canSetup(const Kit *k, const QString &projectPath) const
+{
+ return k && Core::MimeDatabase::findByFile(QFileInfo(projectPath))
+ .matchesType(QLatin1String(Constants::MAKEFILE_MIMETYPE));
+}
+
+QList<BuildInfo *> AutotoolsBuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const
+{
+ QList<BuildInfo *> result;
+ QTC_ASSERT(canSetup(k, projectPath), return result);
+ BuildInfo *info = createBuildInfo(k,
+ Utils::FileName::fromString(AutotoolsProject::defaultBuildDirectory(projectPath)));
+ //: The name of the build configuration created by default for a autotools project.
+ info->displayName = tr("Default");
+ result << info;
+ return result;
+}
+
BuildConfiguration *AutotoolsBuildConfigurationFactory::create(Target *parent, const BuildInfo *info) const
{
QTC_ASSERT(parent, return 0);
@@ -165,6 +183,7 @@ BuildInfo *AutotoolsBuildConfigurationFactory::createBuildInfo(const ProjectExpl
info->typeName = tr("Build");
info->buildDirectory = buildDir;
info->kitId = k->id();
+ info->supportsShadowBuild = true; // Works sometimes...
return info;
}
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
index 15a535ff681..3375cd3428d 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h
@@ -71,6 +71,9 @@ public:
bool canCreate(const ProjectExplorer::Target *parent) const;
QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const;
+ bool canSetup(const ProjectExplorer::Kit *k, const QString &projectPath) const;
+ QList<ProjectExplorer::BuildInfo *> availableSetups(const ProjectExplorer::Kit *k,
+ const QString &projectPath) const;
ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent,
const ProjectExplorer::BuildInfo *info) const;
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index 825d3e4d20a..9d7179dc6c7 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -132,7 +132,30 @@ QList<ProjectExplorer::BuildInfo *> CMakeBuildConfigurationFactory::availableBui
QList<ProjectExplorer::BuildInfo *> result;
QTC_ASSERT(canCreate(parent), return result);
- CMakeBuildInfo *info = createBuildInfo(parent->kit(), parent->project()->projectDirectory());
+ CMakeBuildInfo *info = createBuildInfo(parent->kit(),
+ parent->project()->projectDirectory());
+ result << info;
+ return result;
+}
+
+bool CMakeBuildConfigurationFactory::canSetup(const ProjectExplorer::Kit *k, const QString &projectPath) const
+{
+ return k && Core::MimeDatabase::findByFile(QFileInfo(projectPath))
+ .matchesType(QLatin1String(Constants::CMAKEMIMETYPE));
+}
+
+QList<ProjectExplorer::BuildInfo *> CMakeBuildConfigurationFactory::availableSetups(const ProjectExplorer::Kit *k,
+ const QString &projectPath) const
+{
+ QList<ProjectExplorer::BuildInfo *> result;
+ QTC_ASSERT(canSetup(k, projectPath), return result);
+
+ CMakeBuildInfo *info = createBuildInfo(k, ProjectExplorer::Project::projectDirectory(projectPath));
+ //: The name of the build configuration created by default for a cmake project.
+ info->displayName = tr("Default");
+ info->buildDirectory
+ = Utils::FileName::fromString(CMakeProject::shadowBuildDirectory(projectPath, k,
+ info->displayName));
result << info;
return result;
}
@@ -234,6 +257,7 @@ CMakeBuildInfo *CMakeBuildConfigurationFactory::createBuildInfo(const ProjectExp
k->addToEnvironment(info->environment);
info->useNinja = false;
info->sourceDirectory = sourceDir;
+ info->supportsShadowBuild = true;
return info;
}
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
index 2b02f3063e2..de7ab612d33 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.h
@@ -87,6 +87,9 @@ public:
bool canCreate(const ProjectExplorer::Target *parent) const;
QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const;
+ bool canSetup(const ProjectExplorer::Kit *k, const QString &projectPath) const;
+ QList<ProjectExplorer::BuildInfo *> availableSetups(const ProjectExplorer::Kit *k,
+ const QString &projectPath) const;
ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent,
const ProjectExplorer::BuildInfo *info) const;
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.h b/src/plugins/cmakeprojectmanager/cmakeproject.h
index c7946d95020..c950575e0fd 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.h
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.h
@@ -93,8 +93,8 @@ public:
CMakeBuildTarget buildTargetForTitle(const QString &title);
- QString shadowBuildDirectory(const QString &projectFilePath, const ProjectExplorer::Kit *k,
- const QString &bcName);
+ static QString shadowBuildDirectory(const QString &projectFilePath, const ProjectExplorer::Kit *k,
+ const QString &bcName);
bool isProjectFile(const QString &fileName);
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
index 4b1795344ca..f130f327b42 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
@@ -102,6 +102,23 @@ QList<BuildInfo *> GenericBuildConfigurationFactory::availableBuilds(const Targe
return result;
}
+bool GenericBuildConfigurationFactory::canSetup(const Kit *k, const QString &projectPath) const
+{
+ return k && Core::MimeDatabase::findByFile(QFileInfo(projectPath))
+ .matchesType(QLatin1String(Constants::GENERICMIMETYPE));
+}
+
+QList<BuildInfo *> GenericBuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const
+{
+ QList<BuildInfo *> result;
+ QTC_ASSERT(canSetup(k, projectPath), return result);
+ BuildInfo *info = createBuildInfo(k, Utils::FileName::fromString(ProjectExplorer::Project::projectDirectory(projectPath)));
+ //: The name of the build configuration created by default for a generic project.
+ info->displayName = tr("Default");
+ result << info;
+ return result;
+}
+
BuildConfiguration *GenericBuildConfigurationFactory::create(Target *parent, const BuildInfo *info) const
{
QTC_ASSERT(canCreate(parent), return 0);
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.h b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
index 449b6d017a2..aca2452d658 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.h
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.h
@@ -74,6 +74,9 @@ public:
bool canCreate(const ProjectExplorer::Target *parent) const;
QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const;
+ bool canSetup(const ProjectExplorer::Kit *k, const QString &projectPath) const;
+ QList<ProjectExplorer::BuildInfo *> availableSetups(const ProjectExplorer::Kit *k,
+ const QString &projectPath) const;
ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent,
const ProjectExplorer::BuildInfo *info) const;
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index 84cb07b285b..8366ff00f0f 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -341,6 +341,18 @@ IBuildConfigurationFactory *IBuildConfigurationFactory::find(Target *parent, con
return 0;
}
+// setup
+IBuildConfigurationFactory *IBuildConfigurationFactory::find(Kit *k, const QString &projectPath)
+{
+ QList<IBuildConfigurationFactory *> factories
+ = ExtensionSystem::PluginManager::instance()->getObjects<IBuildConfigurationFactory>();
+ foreach (IBuildConfigurationFactory *factory, factories) {
+ if (factory->canSetup(k, projectPath))
+ return factory;
+ }
+ return 0;
+}
+
// create
IBuildConfigurationFactory * IBuildConfigurationFactory::find(Target *parent)
{
diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 69842fba64d..52bca21090a 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -133,6 +133,13 @@ public:
// List of build information that can be used to create a new build configuration via
// "Add Build Configuration" button.
virtual QList<BuildInfo *> availableBuilds(const Target *parent) const = 0;
+
+ // Used to see whether this factory can produce any BuildConfigurations for a kit when
+ // setting up the given project.
+ virtual bool canSetup(const Kit *k, const QString &projectPath) const = 0;
+ // List of build information that can be used to initially set up a new build configuration.
+ virtual QList<BuildInfo *> availableSetups(const Kit *k, const QString &projectPath) const = 0;
+
virtual BuildConfiguration *create(Target *parent, const BuildInfo *info) const = 0;
// used to recreate the runConfigurations when restoring settings
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
index 15a661d8284..ced35e0b85e 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.cpp
@@ -98,7 +98,7 @@ PropertiesPanel *BuildSettingsPanelFactory::createPanel(Target *target)
BuildSettingsWidget::~BuildSettingsWidget()
{
- clear();
+ clearWidgets();
qDeleteAll(m_buildInfoList);
}
@@ -195,7 +195,7 @@ void BuildSettingsWidget::addSubWidget(NamedWidget *widget)
m_subWidgets.append(widget);
}
-void BuildSettingsWidget::clear()
+void BuildSettingsWidget::clearWidgets()
{
qDeleteAll(m_subWidgets);
m_subWidgets.clear();
@@ -232,7 +232,7 @@ void BuildSettingsWidget::updateAddButtonMenu()
void BuildSettingsWidget::updateBuildSettings()
{
- clear();
+ clearWidgets();
// update buttons
m_removeButton->setEnabled(m_target->buildConfigurations().size() > 1);
diff --git a/src/plugins/projectexplorer/buildsettingspropertiespage.h b/src/plugins/projectexplorer/buildsettingspropertiespage.h
index d75b701d945..67e84a67a7b 100644
--- a/src/plugins/projectexplorer/buildsettingspropertiespage.h
+++ b/src/plugins/projectexplorer/buildsettingspropertiespage.h
@@ -72,7 +72,7 @@ public:
BuildSettingsWidget(Target *target);
~BuildSettingsWidget();
- void clear();
+ void clearWidgets();
void addSubWidget(ProjectExplorer::NamedWidget *widget);
QList<ProjectExplorer::NamedWidget *> subWidgets() const;
diff --git a/src/plugins/qt4projectmanager/wizards/importwidget.cpp b/src/plugins/projectexplorer/importwidget.cpp
similarity index 98%
rename from src/plugins/qt4projectmanager/wizards/importwidget.cpp
rename to src/plugins/projectexplorer/importwidget.cpp
index d3e5d99395f..01d0cb38802 100644
--- a/src/plugins/qt4projectmanager/wizards/importwidget.cpp
+++ b/src/plugins/projectexplorer/importwidget.cpp
@@ -35,7 +35,7 @@
#include <QPushButton>
#include <QVBoxLayout>
-namespace Qt4ProjectManager {
+namespace ProjectExplorer {
namespace Internal {
ImportWidget::ImportWidget(QWidget *parent) :
@@ -85,4 +85,4 @@ void ImportWidget::handleImportRequest()
}
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace ProjectExplorer
diff --git a/src/plugins/qt4projectmanager/wizards/importwidget.h b/src/plugins/projectexplorer/importwidget.h
similarity index 96%
rename from src/plugins/qt4projectmanager/wizards/importwidget.h
rename to src/plugins/projectexplorer/importwidget.h
index 9cb1d728ca4..5eb88350daa 100644
--- a/src/plugins/qt4projectmanager/wizards/importwidget.h
+++ b/src/plugins/projectexplorer/importwidget.h
@@ -37,7 +37,7 @@ class PathChooser;
class FileName;
} // namespace Utils
-namespace Qt4ProjectManager {
+namespace ProjectExplorer {
namespace Internal {
class ImportWidget : public QWidget
@@ -61,6 +61,6 @@ private:
};
} // namespace Internal
-} // namespace Qt4ProjectManager
+} // namespace ProjectExplorer
#endif // IMPORTWIDGET_H
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 54838549cd6..7dc2ddac018 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -282,6 +282,7 @@ Target *Project::restoreTarget(const QVariantMap &data)
delete t;
return 0;
}
+
return t;
}
@@ -505,8 +506,16 @@ void Project::setup(QList<const BuildInfo *> infoList)
continue;
t->addBuildConfiguration(bc);
}
- foreach (Target *t, toRegister)
+ foreach (Target *t, toRegister) {
+ t->updateDefaultDeployConfigurations();
+ t->updateDefaultRunConfigurations();
addTarget(t);
+ }
+}
+
+ProjectImporter *Project::createProjectImporter() const
+{
+ return 0;
}
void Project::onBuildDirectoryChanged()
diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h
index 84be549966b..962512c7b19 100644
--- a/src/plugins/projectexplorer/project.h
+++ b/src/plugins/projectexplorer/project.h
@@ -47,8 +47,10 @@ namespace ProjectExplorer {
class BuildInfo;
class IProjectManager;
class EditorConfiguration;
+class ProjectImporter;
class ProjectNode;
class Kit;
+class KitMatcher;
class NamedWidget;
class Target;
class ProjectPrivate;
@@ -125,6 +127,9 @@ public:
virtual void configureAsExampleProject(const QStringList &platforms);
virtual bool supportsNoTargetPanel() const;
+ virtual ProjectImporter *createProjectImporter() const;
+ virtual KitMatcher *createRequiredKitMatcher() const { return 0; }
+ virtual KitMatcher *createPreferredKitMatcher() const { return 0; }
virtual bool needsSpecialDeployment() const;
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index ed3aa3739c8..16c20331175 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -37,6 +37,7 @@
#include "projectexplorersettings.h"
#include "projectmacroexpander.h"
#include "removetaskhandler.h"
+#include "unconfiguredprojectpanel.h"
#include "kitmanager.h"
#include "kitoptionspage.h"
#include "target.h"
@@ -429,6 +430,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
addAutoReleasedObject(new DependenciesPanelFactory);
addAutoReleasedObject(new ProcessStepFactory);
+ addAutoReleasedObject(new UnconfiguredProjectPanel);
addAutoReleasedObject(new AllProjectsFind);
addAutoReleasedObject(new CurrentProjectFind);
@@ -1653,7 +1655,7 @@ void ProjectExplorerPlugin::buildStateChanged(Project * pro)
{
if (debug) {
qDebug() << "buildStateChanged";
- qDebug() << pro->document()->filePath() << "isBuilding()" << BuildManager::isBuilding(pro);
+ qDebug() << pro->projectFilePath() << "isBuilding()" << BuildManager::isBuilding(pro);
}
Q_UNUSED(pro)
updateActions();
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 44009c2c53d..425920fc17b 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -11,12 +11,17 @@ HEADERS += projectexplorer.h \
environmentaspect.h \
environmentaspectwidget.h \
gcctoolchain.h \
+ importwidget.h \
localapplicationrunconfiguration.h \
localenvironmentaspect.h \
osparser.h \
projectexplorer_export.h \
+ projectimporter.h \
projectwindow.h \
removetaskhandler.h \
+ targetsetuppage.h \
+ targetsetupwidget.h \
+ unconfiguredprojectpanel.h \
kit.h \
kitchooser.h \
kitconfigwidget.h \
@@ -147,11 +152,16 @@ SOURCES += projectexplorer.cpp \
environmentaspect.cpp \
environmentaspectwidget.cpp \
gcctoolchain.cpp \
+ importwidget.cpp \
localapplicationrunconfiguration.cpp \
localenvironmentaspect.cpp \
osparser.cpp \
+ projectimporter.cpp \
projectwindow.cpp \
removetaskhandler.cpp \
+ targetsetuppage.cpp \
+ targetsetupwidget.cpp \
+ unconfiguredprojectpanel.cpp \
kit.cpp \
kitchooser.cpp \
kitconfigwidget.cpp \
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 18ff08a8eaa..3772f33c082 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -72,6 +72,7 @@ QtcPlugin {
"gcctoolchainfactories.h",
"gnumakeparser.cpp", "gnumakeparser.h",
"headerpath.h",
+ "importwidget.cpp", "importwidget.h",
"ioutputparser.cpp", "ioutputparser.h",
"iprojectmanager.h",
"iprojectproperties.h",
@@ -108,6 +109,7 @@ QtcPlugin {
"projectexplorersettings.h",
"projectexplorersettingspage.cpp", "projectexplorersettingspage.h", "projectexplorersettingspage.ui",
"projectfilewizardextension.cpp", "projectfilewizardextension.h",
+ "projectimporter.cpp", "projectimporter.h",
"projectmacroexpander.cpp", "projectmacroexpander.h",
"projectmodels.cpp", "projectmodels.h",
"projectnodes.cpp", "projectnodes.h",
@@ -126,8 +128,9 @@ QtcPlugin {
"target.cpp", "target.h",
"targetselector.cpp", "targetselector.h",
"targetsettingspanel.cpp", "targetsettingspanel.h",
- "targetsettingswidget.cpp", "targetsettingswidget.h",
- "targetsettingswidget.ui",
+ "targetsettingswidget.cpp", "targetsettingswidget.h", "targetsettingswidget.ui",
+ "targetsetuppage.cpp", "targetsetuppage.h",
+ "targetsetupwidget.cpp", "targetsetupwidget.h",
"task.cpp", "task.h",
"taskhub.cpp", "taskhub.h",
"taskmodel.cpp", "taskmodel.h",
@@ -136,6 +139,7 @@ QtcPlugin {
"toolchainconfigwidget.cpp", "toolchainconfigwidget.h",
"toolchainmanager.cpp", "toolchainmanager.h",
"toolchainoptionspage.cpp", "toolchainoptionspage.h",
+ "unconfiguredprojectpanel.cpp", "unconfiguredprojectpanel.h",
"vcsannotatetaskhandler.cpp", "vcsannotatetaskhandler.h",
]
}
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 4275912b142..0acabbf38ea 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -246,6 +246,9 @@ const char VAR_CURRENTKIT_ID[] = "CurrentKit:Id";
const char VAR_CURRENTBUILD_NAME[] = "CurrentBuild:Name";
const char VAR_CURRENTBUILD_TYPE[] = "CurrentBuild:Type";
+// Unconfigured Panel
+const char UNCONFIGURED_PANEL_PAGE_ID[] = "UnconfiguredPanel";
+
} // namespace Constants
// Run modes
diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp
new file mode 100644
index 00000000000..6c8378dc06b
--- /dev/null
+++ b/src/plugins/projectexplorer/projectimporter.cpp
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 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.
+**
+****************************************************************************/
+
+#include "projectimporter.h"
+
+#include "kit.h"
+#include "kitmanager.h"
+#include "project.h"
+
+#include <coreplugin/idocument.h>
+
+#include <utils/qtcassert.h>
+
+namespace ProjectExplorer {
+
+static const Core::Id KIT_IS_TEMPORARY("PE.TempKit");
+static const Core::Id KIT_TEMPORARY_NAME("PE.TempName");
+static const Core::Id KIT_FINAL_NAME("PE.FinalName");
+static const Core::Id TEMPORARY_OF_PROJECTS("PE.TempProject");
+
+ProjectImporter::ProjectImporter(const QString &path) : m_projectPath(path), m_isUpdating(false)
+{ }
+
+ProjectImporter::~ProjectImporter()
+{
+ foreach (Kit *k, KitManager::kits())
+ removeProject(k, m_projectPath);
+}
+
+void ProjectImporter::markTemporary(Kit *k)
+{
+ QTC_ASSERT(!k->hasValue(KIT_IS_TEMPORARY), return);
+
+ setIsUpdating(true);
+
+ const QString name = k->displayName();
+ k->setDisplayName(QCoreApplication::translate("ProjectExplorer::ProjectImporter",
+ "%1 - temporary").arg(name));
+
+ k->setValue(KIT_TEMPORARY_NAME, k->displayName());
+ k->setValue(KIT_FINAL_NAME, name);
+ k->setValue(KIT_IS_TEMPORARY, true);
+
+ setIsUpdating(false);
+}
+
+void ProjectImporter::makePermanent(Kit *k)
+{
+ if (!k->hasValue(KIT_IS_TEMPORARY))
+ return;
+
+ setIsUpdating(true);
+
+ k->removeKey(KIT_IS_TEMPORARY);
+ k->removeKey(TEMPORARY_OF_PROJECTS);
+ const QString tempName = k->value(KIT_TEMPORARY_NAME).toString();
+ if (!tempName.isNull() && k->displayName() == tempName)
+ k->setDisplayName(k->value(KIT_FINAL_NAME).toString());
+ k->removeKey(KIT_TEMPORARY_NAME);
+ k->removeKey(KIT_FINAL_NAME);
+
+ setIsUpdating(false);
+}
+
+void ProjectImporter::cleanupKit(Kit *k)
+{
+ Q_UNUSED(k);
+}
+
+void ProjectImporter::addProject(Kit *k)
+{
+ if (!k->hasValue(KIT_IS_TEMPORARY))
+ return;
+
+ QStringList projects = k->value(TEMPORARY_OF_PROJECTS, QStringList()).toStringList();
+
+ projects.append(m_projectPath); // note: There can be more than one instance of the project added!
+
+ setIsUpdating(true);
+
+ k->setValue(TEMPORARY_OF_PROJECTS, projects);
+
+ setIsUpdating(false);
+}
+
+void ProjectImporter::removeProject(Kit *k, const QString &path)
+{
+ if (!k->hasValue(KIT_IS_TEMPORARY))
+ return;
+
+ QStringList projects = k->value(TEMPORARY_OF_PROJECTS, QStringList()).toStringList();
+ projects.removeOne(path);
+
+ setIsUpdating(true);
+
+ if (projects.isEmpty())
+ ProjectExplorer::KitManager::deregisterKit(k);
+ else
+ k->setValue(TEMPORARY_OF_PROJECTS, projects);
+
+ setIsUpdating(false);
+}
+
+} // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/projectimporter.h b/src/plugins/projectexplorer/projectimporter.h
new file mode 100644
index 00000000000..1bd5243dc15
--- /dev/null
+++ b/src/plugins/projectexplorer/projectimporter.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 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.
+**
+****************************************************************************/
+
+#ifndef PROJECTIMPORTER_H
+#define PROJECTIMPORTER_H
+
+#include "projectexplorer_export.h"
+
+#include <utils/fileutils.h>
+
+namespace ProjectExplorer {
+
+class BuildInfo;
+class Kit;
+class Project;
+class Target;
+
+// Documentation inside.
+class PROJECTEXPLORER_EXPORT ProjectImporter
+{
+public:
+ ProjectImporter(const QString &path);
+ virtual ~ProjectImporter();
+
+ const QString projectFilePath() const { return m_projectPath; }
+
+ virtual QList<BuildInfo *> import(const Utils::FileName &importPath, bool silent = false) = 0;
+ virtual QStringList importCandidates(const Utils::FileName &projectFilePath) = 0;
+ virtual Target *preferredTarget(const QList<Target *> &possibleTargets) = 0;
+
+ bool isUpdating() const { return m_isUpdating; }
+
+ virtual void markTemporary(Kit *k);
+ virtual void makePermanent(Kit *k);
+
+ // Additional cleanup that has to happen when kits are removed
+ virtual void cleanupKit(Kit *k);
+
+ void addProject(Kit *k);
+ void removeProject(Kit *k, const QString &path);
+
+protected:
+ void setIsUpdating(bool b) { m_isUpdating = b; }
+
+private:
+ const QString m_projectPath;
+ bool m_isUpdating;
+};
+
+} // namespace ProjectExplorer
+
+#endif // PROJECTIMPORTER_H
diff --git a/src/plugins/projectexplorer/target.cpp b/src/plugins/projectexplorer/target.cpp
index 58149141fe1..b8679435184 100644
--- a/src/plugins/projectexplorer/target.cpp
+++ b/src/plugins/projectexplorer/target.cpp
@@ -528,7 +528,7 @@ void Target::updateDefaultBuildConfigurations()
qWarning("No build configuration factory found for target id '%s'.", qPrintable(id().toString()));
return;
}
- QList<BuildInfo *> infoList = bcFactory->availableBuilds(this);
+ QList<BuildInfo *> infoList = bcFactory->availableSetups(this->kit(), project()->projectFilePath());
foreach (BuildInfo *info, infoList) {
BuildConfiguration *bc = bcFactory->create(this, info);
if (!bc)
diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp
new file mode 100644
index 00000000000..ddbf1911e07
--- /dev/null
+++ b/src/plugins/projectexplorer/targetsetuppage.cpp
@@ -0,0 +1,531 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 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.
+**
+****************************************************************************/
+
+#include "targetsetuppage.h"
+#include "buildconfiguration.h"
+#include "buildinfo.h"
+#include "kit.h"
+#include "kitmanager.h"
+#include "importwidget.h"
+#include "project.h"
+#include "projectexplorerconstants.h"
+#include "target.h"
+#include "targetsetupwidget.h"
+
+#include <coreplugin/icore.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
+
+#include <QFileInfo>
+#include <QLabel>
+#include <QMessageBox>
+#include <QScrollArea>
+#include <QVBoxLayout>
+
+namespace ProjectExplorer {
+namespace Internal {
+
+class TargetSetupPageUi
+{
+public:
+ QWidget *centralWidget;
+ QWidget *scrollAreaWidget;
+ QScrollArea *scrollArea;
+ QLabel *headerLabel;
+ QLabel *descriptionLabel;
+ QLabel *noValidKitLabel;
+ QLabel *optionHintLabel;
+
+ void setupUi(QWidget *q)
+ {
+ QWidget *setupTargetPage = new QWidget(q);
+ descriptionLabel = new QLabel(setupTargetPage);
+ descriptionLabel->setWordWrap(true);
+ descriptionLabel->setVisible(false);
+
+ headerLabel = new QLabel(setupTargetPage);
+ headerLabel->setWordWrap(true);
+ headerLabel->setVisible(false);
+
+ noValidKitLabel = new QLabel(setupTargetPage);
+ noValidKitLabel->setWordWrap(true);
+ noValidKitLabel->setText(TargetSetupPage::tr("<span style=\" font-weight:600;\">No valid kits found.</span>"));
+
+
+ optionHintLabel = new QLabel(setupTargetPage);
+ optionHintLabel->setWordWrap(true);
+ optionHintLabel->setText(TargetSetupPage::tr(
+ "Please add a kit in the <a href=\"buildandrun\">options</a> "
+ "or via the maintenance tool of the SDK."));
+ optionHintLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
+ optionHintLabel->setVisible(false);
+
+ centralWidget = new QWidget(setupTargetPage);
+ QSizePolicy policy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+ policy.setHorizontalStretch(0);
+ policy.setVerticalStretch(0);
+ policy.setHeightForWidth(centralWidget->sizePolicy().hasHeightForWidth());
+ centralWidget->setSizePolicy(policy);
+
+ scrollAreaWidget = new QWidget(setupTargetPage);
+ scrollArea = new QScrollArea(scrollAreaWidget);
+ scrollArea->setWidgetResizable(true);
+
+ QWidget *scrollAreaWidgetContents;
+ scrollAreaWidgetContents = new QWidget();
+ scrollAreaWidgetContents->setGeometry(QRect(0, 0, 230, 81));
+ scrollArea->setWidget(scrollAreaWidgetContents);
+
+ QVBoxLayout *verticalLayout = new QVBoxLayout(scrollAreaWidget);
+ verticalLayout->setSpacing(0);
+ verticalLayout->setContentsMargins(0, 0, 0, 0);
+ verticalLayout->addWidget(scrollArea);
+
+ QVBoxLayout *verticalLayout_2 = new QVBoxLayout(setupTargetPage);
+ verticalLayout_2->addWidget(headerLabel);
+ verticalLayout_2->addWidget(noValidKitLabel);
+ verticalLayout_2->addWidget(descriptionLabel);
+ verticalLayout_2->addWidget(optionHintLabel);
+ verticalLayout_2->addWidget(centralWidget);
+ verticalLayout_2->addWidget(scrollAreaWidget);
+
+ QVBoxLayout *verticalLayout_3 = new QVBoxLayout(q);
+ verticalLayout_3->setContentsMargins(0, 0, 0, -1);
+ verticalLayout_3->addWidget(setupTargetPage);
+
+ QObject::connect(optionHintLabel, SIGNAL(linkActivated(QString)),
+ q, SLOT(openOptions()));
+ }
+};
+
+} // namespace Internal
+
+using namespace Internal;
+
+TargetSetupPage::TargetSetupPage(QWidget *parent) :
+ QWizardPage(parent),
+ m_requiredMatcher(0),
+ m_preferredMatcher(0),
+ m_importer(0),
+ m_baseLayout(0),
+ m_importSearch(false),
+ m_firstWidget(0),
+ m_ui(new TargetSetupPageUi),
+ m_importWidget(new Internal::ImportWidget(this)),
+ m_spacer(new QSpacerItem(0,0, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding)),
+ m_forceOptionHint(false)
+{
+ setObjectName(QLatin1String("TargetSetupPage"));
+ setWindowTitle(tr("Select Kits for Your Project"));
+ m_ui->setupUi(this);
+
+ QSizePolicy policy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+ policy.setHorizontalStretch(0);
+ policy.setVerticalStretch(0);
+ policy.setHeightForWidth(sizePolicy().hasHeightForWidth());
+ setSizePolicy(policy);
+
+ QWidget *centralWidget = new QWidget(this);
+ m_ui->scrollArea->setWidget(centralWidget);
+ centralWidget->setLayout(new QVBoxLayout);
+ m_ui->centralWidget->setLayout(new QVBoxLayout);
+ m_ui->centralWidget->layout()->setMargin(0);
+
+ setUseScrollArea(true);
+ setImportSearch(false);
+
+ setTitle(tr("Kit Selection"));
+
+ QObject *km = KitManager::instance();
+ connect(km, SIGNAL(kitAdded(ProjectExplorer::Kit*)),
+ this, SLOT(handleKitAddition(ProjectExplorer::Kit*)));
+ connect(km, SIGNAL(kitRemoved(ProjectExplorer::Kit*)),
+ this, SLOT(handleKitRemoval(ProjectExplorer::Kit*)));
+ connect(km, SIGNAL(kitUpdated(ProjectExplorer::Kit*)),
+ this, SLOT(handleKitUpdate(ProjectExplorer::Kit*)));
+ connect(m_importWidget, SIGNAL(importFrom(Utils::FileName)),
+ this, SLOT(import(Utils::FileName)));
+}
+
+void TargetSetupPage::initializePage()
+{
+ reset();
+
+ setupWidgets();
+ setupImports();
+ selectAtLeastOneKit();
+}
+
+void TargetSetupPage::setRequiredKitMatcher(KitMatcher *matcher)
+{
+ m_requiredMatcher = matcher;
+}
+
+QList<Core::Id> TargetSetupPage::selectedKits() const
+{
+ QList<Core::Id> result;
+ QMap<Core::Id, Internal::TargetSetupWidget *>::const_iterator it, end;
+ it = m_widgets.constBegin();
+ end = m_widgets.constEnd();
+
+ for ( ; it != end; ++it) {
+ if (isKitSelected(it.key()))
+ result << it.key();
+ }
+ return result;
+}
+
+void TargetSetupPage::setPreferredKitMatcher(KitMatcher *matcher)
+{
+ m_preferredMatcher = matcher;
+}
+
+TargetSetupPage::~TargetSetupPage()
+{
+ reset();
+ delete m_ui;
+ delete m_preferredMatcher;
+ delete m_requiredMatcher;
+ delete m_importer;
+}
+
+bool TargetSetupPage::isKitSelected(Core::Id id) const
+{
+ TargetSetupWidget *widget = m_widgets.value(id);
+ return widget && widget->isKitSelected();
+}
+
+void TargetSetupPage::setKitSelected(Core::Id id, bool selected)
+{
+ TargetSetupWidget *widget = m_widgets.value(id);
+ if (widget)
+ widget->setKitSelected(selected);
+}
+
+bool TargetSetupPage::isComplete() const
+{
+ foreach (TargetSetupWidget *widget, m_widgets.values())
+ if (widget->isKitSelected())
+ return true;
+ return false;
+}
+
+void TargetSetupPage::setImportSearch(bool b)
+{
+ m_importSearch = b;
+ m_importWidget->setVisible(b);
+}
+
+void TargetSetupPage::setupWidgets()
+{
+ QList<Kit *> kitList;
+ // Known profiles:
+ if (m_requiredMatcher)
+ kitList = KitManager::matchingKits(*m_requiredMatcher);
+ else
+ kitList = KitManager::kits();
+
+ foreach (Kit *k, kitList)
+ addWidget(k);
+
+ // Setup import widget:
+ m_baseLayout->addWidget(m_importWidget);
+ Utils::FileName path = Utils::FileName::fromString(m_projectPath);
+ path = path.parentDir(); // base dir
+ path = path.parentDir(); // parent dir
+ m_importWidget->setCurrentDirectory(path);
+
+ updateVisibility();
+}
+
+void TargetSetupPage::reset()
+{
+ foreach (TargetSetupWidget *widget, m_widgets.values()) {
+ Kit *k = widget->kit();
+ if (!k)
+ continue;
+ if (m_importer)
+ m_importer->removeProject(k, m_projectPath);
+ delete widget;
+ }
+
+ m_widgets.clear();
+ m_firstWidget = 0;
+}
+
+void TargetSetupPage::setProjectPath(const QString &path)
+{
+ m_projectPath = path;
+ if (!m_projectPath.isEmpty())
+ m_ui->headerLabel->setText(tr("Qt Creator can use the following kits for project <b>%1</b>:",
+ "%1: Project name").arg(QFileInfo(m_projectPath).baseName()));
+ m_ui->headerLabel->setVisible(!m_projectPath.isEmpty());
+
+ if (m_widgets.isEmpty())
+ return;
+
+ reset();
+ setupWidgets();
+}
+
+void TargetSetupPage::setProjectImporter(ProjectImporter *importer)
+{
+ if (m_importer)
+ delete m_importer;
+ m_importer = importer;
+
+ reset();
+ setupWidgets();
+}
+
+void TargetSetupPage::setNoteText(const QString &text)
+{
+ m_ui->descriptionLabel->setText(text);
+ m_ui->descriptionLabel->setVisible(!text.isEmpty());
+}
+
+void TargetSetupPage::showOptionsHint(bool show)
+{
+ m_forceOptionHint = show;
+ updateVisibility();
+}
+
+void TargetSetupPage::setupImports()
+{
+ if (!m_importer || !m_importSearch || m_projectPath.isEmpty())
+ return;
+
+ QStringList toImport = m_importer->importCandidates(Utils::FileName::fromString(m_projectPath));
+ foreach (const QString &path, toImport)
+ import(Utils::FileName::fromString(path), true);
+}
+
+void TargetSetupPage::handleKitAddition(Kit *k)
+{
+ if (isUpdating())
+ return;
+
+ Q_ASSERT(!m_widgets.contains(k->id()));
+ addWidget(k);
+ updateVisibility();
+}
+
+void TargetSetupPage::handleKitRemoval(Kit *k)
+{
+ if (m_importer)
+ m_importer->cleanupKit(k);
+
+ if (isUpdating())
+ return;
+
+ removeWidget(k);
+ updateVisibility();
+}
+
+void TargetSetupPage::handleKitUpdate(Kit *k)
+{
+ if (isUpdating())
+ return;
+
+ if (m_importer)
+ m_importer->makePermanent(k);
+
+ TargetSetupWidget *widget = m_widgets.value(k->id());
+
+ bool acceptable = true;
+ if (m_requiredMatcher && !m_requiredMatcher->matches(k))
+ acceptable = false;
+
+ if (widget && !acceptable)
+ removeWidget(k);
+ else if (!widget && acceptable)
+ addWidget(k);
+
+ updateVisibility();
+}
+
+void TargetSetupPage::selectAtLeastOneKit()
+{
+ bool atLeastOneKitSelected = false;
+ foreach (TargetSetupWidget *w, m_widgets.values()) {
+ if (w->isKitSelected()) {
+ atLeastOneKitSelected = true;
+ break;
+ }
+ }
+
+ if (!atLeastOneKitSelected) {
+ TargetSetupWidget *widget = m_firstWidget;
+ Kit *defaultKit = KitManager::defaultKit();
+ if (defaultKit)
+ widget = m_widgets.value(defaultKit->id(), m_firstWidget);
+ if (widget)
+ widget->setKitSelected(true);
+ m_firstWidget = 0;
+ }
+ emit completeChanged(); // Is this necessary?
+}
+
+void TargetSetupPage::updateVisibility()
+{
+ // Always show the widgets, the import widget always makes sense to show.
+ m_ui->scrollAreaWidget->setVisible(m_baseLayout == m_ui->scrollArea->widget()->layout());
+ m_ui->centralWidget->setVisible(m_baseLayout == m_ui->centralWidget->layout());
+
+ bool hasKits = !m_widgets.isEmpty();
+ m_ui->noValidKitLabel->setVisible(!hasKits);
+ m_ui->optionHintLabel->setVisible(m_forceOptionHint || !hasKits);
+
+ emit completeChanged();
+}
+
+void TargetSetupPage::openOptions()
+{
+ Core::ICore::instance()->showOptionsDialog(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
+ Constants::KITS_SETTINGS_PAGE_ID,
+ this);
+}
+
+void TargetSetupPage::import(const Utils::FileName &path)
+{
+ import(path, false);
+}
+
+bool TargetSetupPage::isUpdating() const
+{
+ if (m_importer)
+ return m_importer->isUpdating();
+ return false;
+}
+
+void TargetSetupPage::import(const Utils::FileName &path, bool silent)
+{
+ if (!m_importer)
+ return;
+
+ QList<BuildInfo *> toImport = m_importer->import(path, silent);
+ foreach (BuildInfo *info, toImport) {
+ TargetSetupWidget *widget = m_widgets.value(info->kitId, 0);
+ if (!widget) {
+ Kit *k = KitManager::find(info->kitId);
+ Q_ASSERT(k);
+ addWidget(k);
+ }
+ widget = m_widgets.value(info->kitId, 0);
+ if (!widget) {
+ delete info;
+ continue;
+ }
+
+ widget->addBuildInfo(info, true);
+ widget->setKitSelected(true);
+ }
+}
+
+void TargetSetupPage::removeWidget(Kit *k)
+{
+ TargetSetupWidget *widget = m_widgets.value(k->id());
+ if (!widget)
+ return;
+ if (widget == m_firstWidget)
+ m_firstWidget = 0;
+ widget->deleteLater();
+ m_widgets.remove(k->id());
+}
+
+TargetSetupWidget *TargetSetupPage::addWidget(Kit *k)
+{
+ if (!k || (m_requiredMatcher && !m_requiredMatcher->matches(k)))
+ return 0;
+
+ IBuildConfigurationFactory *factory
+ = IBuildConfigurationFactory::find(k, m_projectPath);
+ if (!factory)
+ return 0;
+
+ QList<BuildInfo *> infoList = factory->availableSetups(k, m_projectPath);
+ TargetSetupWidget *widget = infoList.isEmpty() ? 0 : new TargetSetupWidget(k, m_projectPath, infoList);
+ if (!widget)
+ return 0;
+
+ m_baseLayout->removeWidget(m_importWidget);
+ m_baseLayout->removeItem(m_spacer);
+
+ widget->setKitSelected(m_preferredMatcher && m_preferredMatcher->matches(k));
+ m_widgets.insert(k->id(), widget);
+ m_baseLayout->addWidget(widget);
+
+ m_baseLayout->addWidget(m_importWidget);
+ m_baseLayout->addItem(m_spacer);
+
+ connect(widget, SIGNAL(selectedToggled()),
+ this, SIGNAL(completeChanged()));
+
+ if (!m_firstWidget)
+ m_firstWidget = widget;
+
+ return widget;
+}
+
+bool TargetSetupPage::setupProject(Project *project)
+{
+ QList<const BuildInfo *> toSetUp; // Pointers are managed by the widgets!
+ foreach (TargetSetupWidget *widget, m_widgets.values()) {
+ if (!widget->isKitSelected())
+ continue;
+
+ Kit *k = widget->kit();
+ if (m_importer)
+ m_importer->makePermanent(k);
+ toSetUp << widget->selectedBuildInfoList();
+ widget->clearKit();
+ }
+
+ project->setup(toSetUp);
+
+ reset(); // This will delete the pointers held in toSetUp!
+ toSetUp.clear();
+
+ Target *activeTarget = 0;
+ if (m_importer)
+ activeTarget = m_importer->preferredTarget(project->targets());
+ if (activeTarget)
+ project->setActiveTarget(activeTarget);
+
+ return true;
+}
+
+void TargetSetupPage::setUseScrollArea(bool b)
+{
+ m_baseLayout = b ? m_ui->scrollArea->widget()->layout() : m_ui->centralWidget->layout();
+ m_ui->scrollAreaWidget->setVisible(b);
+ m_ui->centralWidget->setVisible(!b);
+}
+
+} // namespace ProjectExplorer
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.h b/src/plugins/projectexplorer/targetsetuppage.h
similarity index 67%
rename from src/plugins/qt4projectmanager/wizards/targetsetuppage.h
rename to src/plugins/projectexplorer/targetsetuppage.h
index 73dd8a601ca..7018b5a7b04 100644
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.h
+++ b/src/plugins/projectexplorer/targetsetuppage.h
@@ -30,7 +30,9 @@
#ifndef TARGETSETUPPAGE_H
#define TARGETSETUPPAGE_H
-#include "../qt4projectmanager_global.h"
+#include "projectexplorer_export.h"
+
+#include "projectimporter.h"
#include <QString>
#include <QWizardPage>
@@ -38,44 +40,36 @@
QT_FORWARD_DECLARE_CLASS(QSpacerItem)
+namespace Core { class Id; }
namespace Utils { class FileName; }
-namespace Core {
-class Id;
-} // namespace Core
-
namespace ProjectExplorer {
class Kit;
class KitMatcher;
-} // namespace ProjectExplorer
-
-namespace QtSupport { class BaseQtVersion; }
-
-namespace Qt4ProjectManager {
-class Qt4Project;
-class Qt4TargetSetupWidget;
+class Project;
namespace Internal {
class ImportWidget;
class TargetSetupPageUi;
+class TargetSetupWidget;
} // namespace Internal
/// \internal
-class QT4PROJECTMANAGER_EXPORT TargetSetupPage : public QWizardPage
+class PROJECTEXPLORER_EXPORT TargetSetupPage : public QWizardPage
{
Q_OBJECT
public:
- explicit TargetSetupPage(QWidget* parent = 0);
+ explicit TargetSetupPage(QWidget *parent = 0);
~TargetSetupPage();
/// Initializes the TargetSetupPage
- /// \note The import information is gathered in initializePage(), make sure that the right proFilePath is set before
+ /// \note The import information is gathered in initializePage(), make sure that the right projectPath is set before
void initializePage();
// Call these before initializePage!
- void setRequiredKitMatcher(ProjectExplorer::KitMatcher *matcher);
- void setPreferredKitMatcher(ProjectExplorer::KitMatcher *matcher);
+ void setRequiredKitMatcher(KitMatcher *matcher);
+ void setPreferredKitMatcher(KitMatcher *matcher);
void setImportSearch(bool b);
/// Sets whether the targetsetupage uses a scrollarea
@@ -84,50 +78,46 @@ public:
void setUseScrollArea(bool b);
bool isComplete() const;
- bool setupProject(Qt4ProjectManager::Qt4Project *project);
+ bool setupProject(Project *project);
bool isKitSelected(Core::Id id) const;
void setKitSelected(Core::Id id, bool selected);
QList<Core::Id> selectedKits() const;
- void setProFilePath(const QString &dir);
+ void setProjectPath(const QString &dir);
+ void setProjectImporter(ProjectImporter *importer);
/// Overrides the summary text of the targetsetuppage
void setNoteText(const QString &text);
void showOptionsHint(bool show);
private slots:
- void import(const Utils::FileName &path);
- void handleQtUpdate(const QList<int> &add, const QList<int> &rm, const QList<int> &mod);
void handleKitAddition(ProjectExplorer::Kit *k);
void handleKitRemoval(ProjectExplorer::Kit *k);
void handleKitUpdate(ProjectExplorer::Kit *k);
void updateVisibility();
void openOptions();
+ void import(const Utils::FileName &path);
private:
+ bool isUpdating() const;
void selectAtLeastOneKit();
- void import(const Utils::FileName &path, const bool silent);
- void removeWidget(ProjectExplorer::Kit *k);
- Qt4TargetSetupWidget *addWidget(ProjectExplorer::Kit *k);
+ void removeWidget(Kit *k);
+ Internal::TargetSetupWidget *addWidget(Kit *k);
void setupImports();
+ void import(const Utils::FileName &path, bool silent);
void setupWidgets();
void reset();
- ProjectExplorer::Kit *createTemporaryKit(QtSupport::BaseQtVersion *version, bool temporaryVersion, const Utils::FileName &parsedSpec);
- void cleanKit(ProjectExplorer::Kit *k);
- void makeQtPersistent(ProjectExplorer::Kit *k);
- void addProject(ProjectExplorer::Kit *k, const QString &path);
- void removeProject(ProjectExplorer::Kit *k, const QString &path);
-
- ProjectExplorer::KitMatcher *m_requiredMatcher;
- ProjectExplorer::KitMatcher *m_preferredMatcher;
+
+ KitMatcher *m_requiredMatcher;
+ KitMatcher *m_preferredMatcher;
+ ProjectImporter *m_importer;
QLayout *m_baseLayout;
bool m_importSearch;
- bool m_ignoreUpdates;
- QString m_proFilePath;
+ QString m_projectPath;
QString m_defaultShadowBuildLocation;
- QMap<Core::Id, Qt4TargetSetupWidget *> m_widgets;
- Qt4TargetSetupWidget *m_firstWidget;
+ QMap<Core::Id, Internal::TargetSetupWidget *> m_widgets;
+ Internal::TargetSetupWidget *m_firstWidget;
Internal::TargetSetupPageUi *m_ui;
@@ -137,6 +127,6 @@ private:
bool m_forceOptionHint;
};
-} // namespace Qt4ProjectManager
+} // namespace ProjectExplorer
#endif // TARGETSETUPPAGE_H
diff --git a/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp
similarity index 64%
rename from src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
rename to src/plugins/projectexplorer/targetsetupwidget.cpp
index b254fac4d52..8cd7ea67505 100644
--- a/src/plugins/qt4projectmanager/qt4targetsetupwidget.cpp
+++ b/src/plugins/projectexplorer/targetsetupwidget.cpp
@@ -27,17 +27,17 @@
**
****************************************************************************/
-#include "qt4targetsetupwidget.h"
+#include "targetsetupwidget.h"
-#include "buildconfigurationinfo.h"
-#include "qt4buildconfiguration.h"
+#include "buildconfiguration.h"
+#include "buildinfo.h"
+#include "projectexplorerconstants.h"
+#include "kit.h"
+#include "kitmanager.h"
+#include "kitoptionspage.h"
#include <coreplugin/icore.h>
#include <extensionsystem/pluginmanager.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/kitoptionspage.h>
-#include <qtsupport/qtkitinformation.h>
-
#include <utils/detailsbutton.h>
#include <utils/detailswidget.h>
#include <utils/hostosinfo.h>
@@ -49,15 +49,16 @@
#include <QLabel>
#include <QPushButton>
-namespace Qt4ProjectManager {
+namespace ProjectExplorer {
+namespace Internal {
// -------------------------------------------------------------------------
-// Qt4TargetSetupWidget
+// TargetSetupWidget
// -------------------------------------------------------------------------
-Qt4TargetSetupWidget::Qt4TargetSetupWidget(ProjectExplorer::Kit *k,
- const QString &proFilePath,
- const QList<BuildConfigurationInfo> &infoList) :
+TargetSetupWidget::TargetSetupWidget(Kit *k,
+ const QString &projectPath,
+ const QList<BuildInfo *> &infoList) :
m_kit(k),
m_haveImported(false),
m_ignoreChange(false),
@@ -100,45 +101,48 @@ Qt4TargetSetupWidget::Qt4TargetSetupWidget(ProjectExplorer::Kit *k,
widget->setEnabled(false);
m_detailsWidget->setWidget(widget);
- foreach (const BuildConfigurationInfo &info, infoList)
- addBuildConfigurationInfo(info);
+ foreach (BuildInfo *info, infoList)
+ addBuildInfo(info, false);
- setProFilePath(proFilePath);
+ setProjectPath(projectPath);
connect(m_detailsWidget, SIGNAL(checked(bool)),
this, SLOT(targetCheckBoxToggled(bool)));
- connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitUpdated(ProjectExplorer::Kit*)),
+ connect(KitManager::instance(), SIGNAL(kitUpdated(ProjectExplorer::Kit*)),
this, SLOT(handleKitUpdate(ProjectExplorer::Kit*)));
connect(m_manageButton, SIGNAL(clicked()), this, SLOT(manageKit()));
}
-Qt4TargetSetupWidget::~Qt4TargetSetupWidget()
-{ }
+TargetSetupWidget::~TargetSetupWidget()
+{
+ qDeleteAll(m_infoList);
+ m_infoList.clear();
+}
-ProjectExplorer::Kit *Qt4TargetSetupWidget::kit()
+Kit *TargetSetupWidget::kit()
{
return m_kit;
}
-void Qt4TargetSetupWidget::clearKit()
+void TargetSetupWidget::clearKit()
{
m_kit = 0;
}
-bool Qt4TargetSetupWidget::isKitSelected() const
+bool TargetSetupWidget::isKitSelected() const
{
if (!m_detailsWidget->isChecked())
return false;
- return !selectedBuildConfigurationInfoList().isEmpty();
+ return !selectedBuildInfoList().isEmpty();
}
-void Qt4TargetSetupWidget::setKitSelected(bool b)
+void TargetSetupWidget::setKitSelected(bool b)
{
// Only check target if there are build configurations possible
- b &= !selectedBuildConfigurationInfoList().isEmpty();
+ b &= !selectedBuildInfoList().isEmpty();
m_ignoreChange = true;
m_detailsWidget->setChecked(b);
m_detailsWidget->widget()->setEnabled(b);
@@ -147,39 +151,36 @@ void Qt4TargetSetupWidget::setKitSelected(bool b)
m_detailsWidget->setState(b ? Utils::DetailsWidget::Expanded : Utils::DetailsWidget::Collapsed);
}
-void Qt4TargetSetupWidget::addBuildConfigurationInfo(const BuildConfigurationInfo &info, bool importing)
+void TargetSetupWidget::addBuildInfo(BuildInfo *info, bool isImport)
{
- if (importing) {
- if (!m_haveImported) {
- // disable everything on first import
- for (int i = 0; i < m_enabled.count(); ++i) {
- m_enabled[i] = false;
- m_checkboxes[i]->setChecked(false);
- }
- m_selected = 0;
+ if (isImport && !m_haveImported) {
+ // disable everything on first import
+ for (int i = 0; i < m_enabled.count(); ++i) {
+ m_enabled[i] = false;
+ m_checkboxes[i]->setChecked(false);
}
+ m_selected = 0;
m_haveImported = true;
}
+
int pos = m_pathChoosers.count();
m_enabled.append(true);
++m_selected;
- m_infoList.append(info);
+ m_infoList << info;
QCheckBox *checkbox = new QCheckBox;
- checkbox->setText(Qt4BuildConfigurationFactory::buildConfigurationDisplayName(info));
+ checkbox->setText(info->displayName);
checkbox->setChecked(m_enabled.at(pos));
checkbox->setAttribute(Qt::WA_LayoutUsesWidgetRect);
m_newBuildsLayout->addWidget(checkbox, pos * 2, 0);
Utils::PathChooser *pathChooser = new Utils::PathChooser();
pathChooser->setExpectedKind(Utils::PathChooser::Directory);
- pathChooser->setPath(info.directory);
- QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(m_kit);
- if (!version)
- return;
- pathChooser->setReadOnly(!version->supportsShadowBuilds() || importing);
+ pathChooser->setFileName(info->buildDirectory);
+ pathChooser->setEnabled(info->supportsShadowBuild);
+ pathChooser->setReadOnly(!info->supportsShadowBuild || isImport);
m_newBuildsLayout->addWidget(pathChooser, pos * 2, 1);
QLabel *reportIssuesLabel = new QLabel;
@@ -203,7 +204,7 @@ void Qt4TargetSetupWidget::addBuildConfigurationInfo(const BuildConfigurationInf
emit selectedToggled();
}
-void Qt4TargetSetupWidget::targetCheckBoxToggled(bool b)
+void TargetSetupWidget::targetCheckBoxToggled(bool b)
{
if (m_ignoreChange)
return;
@@ -219,7 +220,7 @@ void Qt4TargetSetupWidget::targetCheckBoxToggled(bool b)
emit selectedToggled();
}
-void Qt4TargetSetupWidget::manageKit()
+void TargetSetupWidget::manageKit()
{
ProjectExplorer::KitOptionsPage *page =
ExtensionSystem::PluginManager::getObject<ProjectExplorer::KitOptionsPage>();
@@ -227,25 +228,31 @@ void Qt4TargetSetupWidget::manageKit()
return;
page->showKit(m_kit);
- Core::ICore::showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
- ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID);
+ Core::ICore::showOptionsDialog(Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
+ Constants::KITS_SETTINGS_PAGE_ID);
}
-void Qt4TargetSetupWidget::setProFilePath(const QString &proFilePath)
+void TargetSetupWidget::setProjectPath(const QString &projectPath)
{
if (!m_kit)
return;
- m_proFilePath = proFilePath;
+ m_projectPath = projectPath;
clear();
- QList<BuildConfigurationInfo> infoList
- = Qt4BuildConfigurationFactory::availableBuildConfigurations(m_kit, proFilePath);
- foreach (const BuildConfigurationInfo &info, infoList)
- addBuildConfigurationInfo(info);
+ IBuildConfigurationFactory *factory
+ = IBuildConfigurationFactory::find(m_kit, projectPath);
+
+ if (!factory)
+ return;
+
+ QList<BuildInfo *> infoList
+ = factory->availableSetups(m_kit, projectPath);
+ foreach (BuildInfo *info, infoList)
+ addBuildInfo(info, false);
}
-void Qt4TargetSetupWidget::handleKitUpdate(ProjectExplorer::Kit *k)
+void TargetSetupWidget::handleKitUpdate(Kit *k)
{
if (k != m_kit)
return;
@@ -254,9 +261,9 @@ void Qt4TargetSetupWidget::handleKitUpdate(ProjectExplorer::Kit *k)
m_detailsWidget->setSummaryText(k->displayName());
}
-QList<BuildConfigurationInfo> Qt4TargetSetupWidget::selectedBuildConfigurationInfoList() const
+QList<const BuildInfo *> TargetSetupWidget::selectedBuildInfoList() const
{
- QList<BuildConfigurationInfo> result;
+ QList<const BuildInfo *> result;
for (int i = 0; i < m_infoList.count(); ++i) {
if (m_enabled.at(i))
result.append(m_infoList.at(i));
@@ -264,12 +271,7 @@ QList<BuildConfigurationInfo> Qt4TargetSetupWidget::selectedBuildConfigurationIn
return result;
}
-QList<BuildConfigurationInfo> Qt4TargetSetupWidget::allBuildConfigurationInfoList() const
-{
- return m_infoList;
-}
-
-void Qt4TargetSetupWidget::clear()
+void TargetSetupWidget::clear()
{
qDeleteAll(m_checkboxes);
m_checkboxes.clear();
@@ -277,8 +279,9 @@ void Qt4TargetSetupWidget::clear()
m_pathChoosers.clear();
qDeleteAll(m_reportIssuesLabels);
m_reportIssuesLabels.clear();
-
+ qDeleteAll(m_infoList);
m_infoList.clear();
+
m_issues.clear();
m_enabled.clear();
m_selected = 0;
@@ -287,7 +290,7 @@ void Qt4TargetSetupWidget::clear()
emit selectedToggled();
}
-void Qt4TargetSetupWidget::checkBoxToggled(bool b)
+void TargetSetupWidget::checkBoxToggled(bool b)
{
QCheckBox *box = qobject_cast<QCheckBox *>(sender());
if (!box)
@@ -305,7 +308,7 @@ void Qt4TargetSetupWidget::checkBoxToggled(bool b)
}
}
-void Qt4TargetSetupWidget::pathChanged()
+void TargetSetupWidget::pathChanged()
{
if (m_ignoreChange)
return;
@@ -315,45 +318,41 @@ void Qt4TargetSetupWidget::pathChanged()
int index = m_pathChoosers.indexOf(pathChooser);
if (index == -1)
return;
- m_infoList[index].directory = pathChooser->path();
+ m_infoList[index]->buildDirectory = pathChooser->fileName();
reportIssues(index);
}
-void Qt4TargetSetupWidget::reportIssues(int index)
+void TargetSetupWidget::reportIssues(int index)
{
- QPair<ProjectExplorer::Task::TaskType, QString> issues = findIssues(m_infoList.at(index));
+ QPair<Task::TaskType, QString> issues = findIssues(m_infoList.at(index));
QLabel *reportIssuesLabel = m_reportIssuesLabels.at(index);
reportIssuesLabel->setText(issues.second);
- bool error = issues.first != ProjectExplorer::Task::Unknown;
+ bool error = issues.first != Task::Unknown;
reportIssuesLabel->setVisible(error);
m_issues[index] = error;
}
-QPair<ProjectExplorer::Task::TaskType, QString> Qt4TargetSetupWidget::findIssues(const BuildConfigurationInfo &info)
+QPair<Task::TaskType, QString> TargetSetupWidget::findIssues(const BuildInfo *info)
{
- if (m_proFilePath.isEmpty())
- return qMakePair(ProjectExplorer::Task::Unknown, QString());
-
- QString buildDir = info.directory;
- QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(m_kit);
- if (!version)
- return qMakePair(ProjectExplorer::Task::Unknown, QString());
+ if (m_projectPath.isEmpty())
+ return qMakePair(Task::Unknown, QString());
- QList<ProjectExplorer::Task> issues = version->reportIssues(m_proFilePath, buildDir);
+ QString buildDir = info->buildDirectory.toString();
+ QList<Task> issues = info->reportIssues(m_projectPath, buildDir);
QString text;
- ProjectExplorer::Task::TaskType highestType = ProjectExplorer::Task::Unknown;
- foreach (const ProjectExplorer::Task &t, issues) {
+ Task::TaskType highestType = Task::Unknown;
+ foreach (const Task &t, issues) {
if (!text.isEmpty())
text.append(QLatin1String("<br>"));
// set severity:
QString severity;
- if (t.type == ProjectExplorer::Task::Error) {
- highestType = ProjectExplorer::Task::Error;
+ if (t.type == Task::Error) {
+ highestType = Task::Error;
severity = tr("<b>Error:</b> ", "Severity is Task::Error");
- } else if (t.type == ProjectExplorer::Task::Warning) {
- if (highestType == ProjectExplorer::Task::Unknown)
- highestType = ProjectExplorer::Task::Warning;
+ } else if (t.type == Task::Warning) {
+ if (highestType == Task::Unknown)
+ highestType = Task::Warning;
severity = tr("<b>Warning:</b> ", "Severity is Task::Warning");
}
text.append(severity + t.description);
@@ -363,4 +362,5 @@ QPair<ProjectExplorer::Task::TaskType, QString> Qt4TargetSetupWidget::findIssues
return qMakePair(highestType, text);
}
-} // namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace ProjectExplorer
diff --git a/src/plugins/qt4projectmanager/qt4targetsetupwidget.h b/src/plugins/projectexplorer/targetsetupwidget.h
similarity index 69%
rename from src/plugins/qt4projectmanager/qt4targetsetupwidget.h
rename to src/plugins/projectexplorer/targetsetupwidget.h
index a17fe6a51a0..0c67e86167e 100644
--- a/src/plugins/qt4projectmanager/qt4targetsetupwidget.h
+++ b/src/plugins/projectexplorer/targetsetupwidget.h
@@ -27,12 +27,13 @@
**
****************************************************************************/
-#ifndef QT4TARGETSETUPWIDGET_H
-#define QT4TARGETSETUPWIDGET_H
+#ifndef TARGETSETUPWIDGET_H
+#define TARGETSETUPWIDGET_H
-#include "qt4projectmanager_global.h"
+#include "projectexplorer_export.h"
-#include <projectexplorer/task.h>
+#include "buildinfo.h"
+#include "task.h"
#include <QWidget>
@@ -45,38 +46,36 @@ class QPushButton;
class QSpacerItem;
QT_END_NAMESPACE
-namespace ProjectExplorer { class Kit; }
-namespace QtSupport {
-class BaseQtVersion;
-} // namespace QtSupport
namespace Utils {
class DetailsWidget;
class PathChooser;
} // namespace Utils
-namespace Qt4ProjectManager {
-class BuildConfigurationInfo;
+namespace ProjectExplorer {
+class BuildInfo;
+class Kit;
-class QT4PROJECTMANAGER_EXPORT Qt4TargetSetupWidget : public QWidget
+namespace Internal {
+
+class TargetSetupWidget : public QWidget
{
Q_OBJECT
public:
- Qt4TargetSetupWidget(ProjectExplorer::Kit *k,
- const QString &proFilePath,
- const QList<BuildConfigurationInfo> &infoList);
- ~Qt4TargetSetupWidget();
+ TargetSetupWidget(Kit *k,
+ const QString &projectPath,
+ const QList<BuildInfo *> &infoList);
+ ~TargetSetupWidget();
- ProjectExplorer::Kit *kit();
+ Kit *kit();
void clearKit();
bool isKitSelected() const;
void setKitSelected(bool b);
- void addBuildConfigurationInfo(const BuildConfigurationInfo &info, bool importing = false);
+ void addBuildInfo(BuildInfo *info, bool isImport);
- QList<BuildConfigurationInfo> selectedBuildConfigurationInfoList() const;
- QList<BuildConfigurationInfo> allBuildConfigurationInfoList() const;
- void setProFilePath(const QString &proFilePath);
+ QList<const BuildInfo *> selectedBuildInfoList() const;
+ void setProjectPath(const QString &projectPath);
signals:
void selectedToggled() const;
@@ -91,18 +90,18 @@ private slots:
private:
void reportIssues(int index);
- QPair<ProjectExplorer::Task::TaskType, QString> findIssues(const BuildConfigurationInfo &info);
+ QPair<Task::TaskType, QString> findIssues(const BuildInfo *info);
void clear();
- ProjectExplorer::Kit *m_kit;
- QString m_proFilePath;
+ Kit *m_kit;
+ QString m_projectPath;
bool m_haveImported;
Utils::DetailsWidget *m_detailsWidget;
QPushButton *m_manageButton;
QGridLayout *m_newBuildsLayout;
QList<QCheckBox *> m_checkboxes;
QList<Utils::PathChooser *> m_pathChoosers;
- QList<BuildConfigurationInfo> m_infoList;
+ QList<BuildInfo *> m_infoList;
QList<bool> m_enabled;
QList<QLabel *> m_reportIssuesLabels;
QList<bool> m_issues;
@@ -110,6 +109,7 @@ private:
int m_selected; // Number of selected buildconfiguartions
};
-} // namespace Qt4ProjectManager
+} // namespace Internal
+} // namespace ProjectExplorer
-#endif // QT4TARGETSETUPWIDGET_H
+#endif // TARGETSETUPWIDGET_H
diff --git a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp b/src/plugins/projectexplorer/unconfiguredprojectpanel.cpp
similarity index 77%
rename from src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
rename to src/plugins/projectexplorer/unconfiguredprojectpanel.cpp
index b5cf55dc820..0e38fa6f292 100644
--- a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.cpp
+++ b/src/plugins/projectexplorer/unconfiguredprojectpanel.cpp
@@ -28,38 +28,36 @@
****************************************************************************/
#include "unconfiguredprojectpanel.h"
-#include "wizards/targetsetuppage.h"
-#include "qt4projectmanagerconstants.h"
-#include "qt4project.h"
+#include "kit.h"
+#include "kitmanager.h"
+#include "project.h"
+#include "projectexplorer.h"
+#include "projectexplorerconstants.h"
+#include "session.h"
+#include "targetsetuppage.h"
#include <coreplugin/icore.h>
#include <coreplugin/modemanager.h>
#include <coreplugin/coreconstants.h>
-#include <qtsupport/qtkitinformation.h>
-
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/session.h>
#include <QVBoxLayout>
#include <QPushButton>
#include <QDialogButtonBox>
-using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
-
+namespace ProjectExplorer {
+namespace Internal {
UnconfiguredProjectPanel::UnconfiguredProjectPanel()
{
}
-QString Qt4ProjectManager::Internal::UnconfiguredProjectPanel::id() const
+QString UnconfiguredProjectPanel::id() const
{
return QLatin1String(Constants::UNCONFIGURED_PANEL_PAGE_ID);
}
-QString Qt4ProjectManager::Internal::UnconfiguredProjectPanel::displayName() const
+QString UnconfiguredProjectPanel::displayName() const
{
return tr("Configure Project");
}
@@ -69,16 +67,14 @@ int UnconfiguredProjectPanel::priority() const
return -10;
}
-bool Qt4ProjectManager::Internal::UnconfiguredProjectPanel::supports(ProjectExplorer::Project *project)
+bool UnconfiguredProjectPanel::supports(Project *project)
{
- if (qobject_cast<Qt4Project *>(project) && project->targets().isEmpty())
- return true;
- return false;
+ return project->targets().isEmpty() && project->supportsNoTargetPanel();
}
-ProjectExplorer::PropertiesPanel *Qt4ProjectManager::Internal::UnconfiguredProjectPanel::createPanel(ProjectExplorer::Project *project)
+PropertiesPanel *UnconfiguredProjectPanel::createPanel(Project *project)
{
- ProjectExplorer::PropertiesPanel *panel = new ProjectExplorer::PropertiesPanel;
+ PropertiesPanel *panel = new PropertiesPanel;
panel->setDisplayName(displayName());
panel->setIcon(QIcon(QLatin1String(":/projectexplorer/images/unconfigured.png")));
@@ -91,20 +87,22 @@ ProjectExplorer::PropertiesPanel *Qt4ProjectManager::Internal::UnconfiguredProje
/// TargetSetupPageWrapper
////////
-TargetSetupPageWrapper::TargetSetupPageWrapper(ProjectExplorer::Project *project)
- : QWidget(), m_project(qobject_cast<Qt4Project *>(project))
+TargetSetupPageWrapper::TargetSetupPageWrapper(Project *project) :
+ QWidget(), m_project(project)
{
QVBoxLayout *layout = new QVBoxLayout();
layout->setMargin(0);
setLayout(layout);
m_targetSetupPage = new TargetSetupPage(this);
- m_targetSetupPage->setRequiredKitMatcher(new QtSupport::QtVersionKitMatcher);
+ m_targetSetupPage->setProjectImporter(project->createProjectImporter());
m_targetSetupPage->setUseScrollArea(false);
m_targetSetupPage->setImportSearch(true);
- m_targetSetupPage->setProFilePath(project->projectFilePath());
+ m_targetSetupPage->setProjectPath(project->projectFilePath());
m_targetSetupPage->initializePage();
m_targetSetupPage->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+ m_targetSetupPage->setRequiredKitMatcher(project->createRequiredKitMatcher());
+ m_targetSetupPage->setPreferredKitMatcher(project->createPreferredKitMatcher());
updateNoteText();
layout->addWidget(m_targetSetupPage);
@@ -137,21 +135,21 @@ TargetSetupPageWrapper::TargetSetupPageWrapper(ProjectExplorer::Project *project
this, SLOT(cancel()));
connect(m_targetSetupPage, SIGNAL(completeChanged()),
this, SLOT(completeChanged()));
- connect(ProjectExplorer::KitManager::instance(), SIGNAL(defaultkitChanged()),
+ connect(KitManager::instance(), SIGNAL(defaultkitChanged()),
this, SLOT(updateNoteText()));
- connect(ProjectExplorer::KitManager::instance(), SIGNAL(kitUpdated(ProjectExplorer::Kit*)),
+ connect(KitManager::instance(), SIGNAL(kitUpdated(ProjectExplorer::Kit*)),
this, SLOT(kitUpdated(ProjectExplorer::Kit*)));
}
-void TargetSetupPageWrapper::kitUpdated(ProjectExplorer::Kit *k)
+void TargetSetupPageWrapper::kitUpdated(Kit *k)
{
- if (k == ProjectExplorer::KitManager::defaultKit())
+ if (k == KitManager::defaultKit())
updateNoteText();
}
void TargetSetupPageWrapper::updateNoteText()
{
- ProjectExplorer::Kit *k = ProjectExplorer::KitManager::defaultKit();
+ Kit *k = KitManager::defaultKit();
QString text;
bool showHint = false;
@@ -211,3 +209,6 @@ void TargetSetupPageWrapper::completeChanged()
{
m_configureButton->setEnabled(m_targetSetupPage->isComplete());
}
+
+} // namespace Internal
+} // namespace ProjectExplorer
diff --git a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.h b/src/plugins/projectexplorer/unconfiguredprojectpanel.h
similarity index 82%
rename from src/plugins/qt4projectmanager/unconfiguredprojectpanel.h
rename to src/plugins/projectexplorer/unconfiguredprojectpanel.h
index e71e7d2ef10..4e13fe43914 100644
--- a/src/plugins/qt4projectmanager/unconfiguredprojectpanel.h
+++ b/src/plugins/projectexplorer/unconfiguredprojectpanel.h
@@ -30,21 +30,19 @@
#ifndef UNCONFIGUREDPROJECTPANEL_H
#define UNCONFIGUREDPROJECTPANEL_H
-#include <projectexplorer/iprojectproperties.h>
+#include "iprojectproperties.h"
#include <QString>
QT_FORWARD_DECLARE_CLASS(QPushButton)
-namespace ProjectExplorer { class Kit; }
-
-namespace Qt4ProjectManager {
+namespace ProjectExplorer {
+class Kit;
class TargetSetupPage;
-class Qt4Project;
namespace Internal {
-class UnconfiguredProjectPanel : public ProjectExplorer::IProjectPanelFactory
+class UnconfiguredProjectPanel : public IProjectPanelFactory
{
Q_OBJECT
public:
@@ -52,15 +50,15 @@ public:
virtual QString id() const;
virtual QString displayName() const;
int priority() const;
- virtual bool supports(ProjectExplorer::Project *project);
- virtual ProjectExplorer::PropertiesPanel *createPanel(ProjectExplorer::Project *project);
+ virtual bool supports(Project *project);
+ virtual PropertiesPanel *createPanel(Project *project);
};
class TargetSetupPageWrapper : public QWidget
{
Q_OBJECT
public:
- TargetSetupPageWrapper(ProjectExplorer::Project *project);
+ TargetSetupPageWrapper(Project *project);
protected:
void keyReleaseEvent(QKeyEvent *event);
void keyPressEvent(QKeyEvent *event);
@@ -72,13 +70,13 @@ private slots:
void completeChanged();
private:
- Qt4Project *m_project;
+ Project *m_project;
TargetSetupPage *m_targetSetupPage;
QPushButton *m_configureButton;
QPushButton *m_cancelButton;
};
-}
-}
+} // namespace Internal
+} // namespace ProjectExplorer
#endif // UNCONFIGUREDPROJECTPANEL_H
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
index 3350bb6a7b1..fd54f2d3e8c 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
@@ -250,6 +250,7 @@ ProjectExplorer::BuildInfo *QbsBuildConfigurationFactory::createBuildInfo(const
info->buildDirectory = buildDirectory;
info->kitId = k->id();
info->type = type;
+ info->supportsShadowBuild = true;
return info;
}
@@ -272,6 +273,32 @@ QList<ProjectExplorer::BuildInfo *> QbsBuildConfigurationFactory::availableBuild
return result;
}
+bool QbsBuildConfigurationFactory::canSetup(const ProjectExplorer::Kit *k, const QString &projectPath) const
+{
+ return k && Core::MimeDatabase::findByFile(QFileInfo(projectPath))
+ .matchesType(QLatin1String(Constants::MIME_TYPE));
+}
+
+QList<ProjectExplorer::BuildInfo *> QbsBuildConfigurationFactory::availableSetups(const ProjectExplorer::Kit *k, const QString &projectPath) const
+{
+ QList<ProjectExplorer::BuildInfo *> result;
+ QTC_ASSERT(canSetup(k, projectPath), return result);
+
+ const Utils::FileName buildDirectory = QbsProject::defaultBuildDirectory(projectPath);
+
+ ProjectExplorer::BuildInfo *info = createBuildInfo(k, buildDirectory, ProjectExplorer::BuildConfiguration::Debug);
+ //: The name of the debug build configuration created by default for a qbs project.
+ info->displayName = tr("Debug");
+ result << info;
+
+ info = createBuildInfo(k, buildDirectory, ProjectExplorer::BuildConfiguration::Release);
+ //: The name of the release build configuration created by default for a qbs project.
+ info->displayName = tr("Release");
+ result << info;
+
+ return result;
+}
+
ProjectExplorer::BuildConfiguration *QbsBuildConfigurationFactory::create(ProjectExplorer::Target *parent,
const ProjectExplorer::BuildInfo *info) const
{
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
index 9c50c35f416..61bde2f9c33 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.h
@@ -114,6 +114,9 @@ public:
bool canCreate(const ProjectExplorer::Target *parent) const;
QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const;
+ bool canSetup(const ProjectExplorer::Kit *k, const QString &projectPath) const;
+ QList<ProjectExplorer::BuildInfo *> availableSetups(const ProjectExplorer::Kit *k,
+ const QString &projectPath) const;
ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent,
const ProjectExplorer::BuildInfo *info) const;
diff --git a/src/plugins/qt4projectmanager/qmakebuildinfo.h b/src/plugins/qt4projectmanager/qmakebuildinfo.h
index 8ceb78f7d45..2e5795d945a 100644
--- a/src/plugins/qt4projectmanager/qmakebuildinfo.h
+++ b/src/plugins/qt4projectmanager/qmakebuildinfo.h
@@ -33,7 +33,9 @@
#include "qt4buildconfiguration.h"
#include <projectexplorer/buildinfo.h>
+#include <projectexplorer/kitmanager.h>
#include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtkitinformation.h>
namespace Qt4ProjectManager {
@@ -45,6 +47,15 @@ public:
ProjectExplorer::BuildConfiguration::BuildType type;
QString additionalArguments;
QString makefile;
+
+ QList<ProjectExplorer::Task> reportIssues(const QString &projectPath,
+ const QString &buildDir) const
+ {
+ ProjectExplorer::Kit *k = ProjectExplorer::KitManager::find(kitId);
+ QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k);
+ return version ? version->reportIssues(projectPath, buildDir)
+ : QList<ProjectExplorer::Task>();
+ }
};
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp b/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
new file mode 100644
index 00000000000..953e2daed01
--- /dev/null
+++ b/src/plugins/qt4projectmanager/qmakeprojectimporter.cpp
@@ -0,0 +1,254 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 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.
+**
+****************************************************************************/
+
+#include "qmakeprojectimporter.h"
+
+#include "qmakebuildinfo.h"
+#include "qmakekitinformation.h"
+#include "qt4buildconfiguration.h"
+#include "qt4project.h"
+
+#include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/target.h>
+#include <qtsupport/qtkitinformation.h>
+#include <qtsupport/qtsupportconstants.h>
+#include <qtsupport/qtversionfactory.h>
+#include <qtsupport/qtversionmanager.h>
+#include <utils/qtcprocess.h>
+
+#include <QDir>
+#include <QFileInfo>
+#include <QStringList>
+
+#include <QMessageBox>
+
+static const Core::Id QT_IS_TEMPORARY("Qmake.TempQt");
+
+namespace Qt4ProjectManager {
+namespace Internal {
+
+QmakeProjectImporter::QmakeProjectImporter(const QString &path) :
+ ProjectExplorer::ProjectImporter(path)
+{ }
+
+QList<ProjectExplorer::BuildInfo *> QmakeProjectImporter::import(const Utils::FileName &importPath,
+ bool silent)
+{
+ QList<ProjectExplorer::BuildInfo *> result;
+ QFileInfo fi = importPath.toFileInfo();
+ if (!fi.exists() && !fi.isDir())
+ return result;
+
+ QStringList makefiles = QDir(importPath.toString()).entryList(QStringList(QLatin1String("Makefile*")));
+
+ QtSupport::BaseQtVersion *version = 0;
+ bool temporaryVersion = false;
+
+ foreach (const QString &file, makefiles) {
+ // find interesting makefiles
+ QString makefile = importPath.toString() + QLatin1Char('/') + file;
+ Utils::FileName qmakeBinary = QtSupport::QtVersionManager::findQMakeBinaryFromMakefile(makefile);
+ QFileInfo qmakeFi = qmakeBinary.toFileInfo();
+ Utils::FileName canonicalQmakeBinary = Utils::FileName::fromString(qmakeFi.canonicalFilePath());
+ if (canonicalQmakeBinary.isEmpty())
+ continue;
+ if (QtSupport::QtVersionManager::makefileIsFor(makefile, projectFilePath()) != QtSupport::QtVersionManager::SameProject)
+ continue;
+
+ // Find version:
+ foreach (QtSupport::BaseQtVersion *v, QtSupport::QtVersionManager::versions()) {
+ QFileInfo vfi = v->qmakeCommand().toFileInfo();
+ Utils::FileName current = Utils::FileName::fromString(vfi.canonicalFilePath());
+ if (current == canonicalQmakeBinary) {
+ version = v;
+ break;
+ }
+ }
+
+ // Create a new version if not found:
+ if (!version) {
+ // Do not use the canonical path here...
+ version = QtSupport::QtVersionFactory::createQtVersionFromQMakePath(qmakeBinary);
+ if (!version)
+ continue;
+
+ setIsUpdating(true);
+ QtSupport::QtVersionManager::addVersion(version);
+ setIsUpdating(false);
+ temporaryVersion = true;
+ }
+
+ // find qmake arguments and mkspec
+ QPair<QtSupport::BaseQtVersion::QmakeBuildConfigs, QString> makefileBuildConfig =
+ QtSupport::QtVersionManager::scanMakeFile(makefile, version->defaultBuildConfig());
+
+ QString additionalArguments = makefileBuildConfig.second;
+ Utils::FileName parsedSpec =
+ Qt4BuildConfiguration::extractSpecFromArguments(&additionalArguments, importPath.toString(), version);
+ Utils::FileName versionSpec = version->mkspec();
+ if (parsedSpec.isEmpty() || parsedSpec == Utils::FileName::fromString(QLatin1String("default")))
+ parsedSpec = versionSpec;
+
+ QString specArgument;
+ // Compare mkspecs and add to additional arguments
+ if (parsedSpec != versionSpec)
+ specArgument = QLatin1String("-spec ") + Utils::QtcProcess::quoteArg(parsedSpec.toUserOutput());
+ Utils::QtcProcess::addArgs(&specArgument, additionalArguments);
+
+ // Find kits (can be more than one, e.g. (Linux-)Desktop and embedded linux):
+ QList<ProjectExplorer::Kit *> kitList;
+ foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits()) {
+ QtSupport::BaseQtVersion *kitVersion = QtSupport::QtKitInformation::qtVersion(k);
+ Utils::FileName kitSpec = QmakeKitInformation::mkspec(k);
+ ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k);
+ if (kitSpec.isEmpty() && kitVersion)
+ kitSpec = kitVersion->mkspecFor(tc);
+
+ if (kitVersion == version
+ && kitSpec == parsedSpec)
+ kitList.append(k);
+ }
+ if (kitList.isEmpty())
+ kitList.append(createTemporaryKit(version, temporaryVersion, parsedSpec));
+
+ foreach (ProjectExplorer::Kit *k, kitList) {
+ addProject(k);
+
+ Qt4BuildConfigurationFactory *factory
+ = qobject_cast<Qt4BuildConfigurationFactory *>(
+ ProjectExplorer::IBuildConfigurationFactory::find(k, projectFilePath()));
+
+ if (!factory)
+ continue;
+
+ // create info:
+ QmakeBuildInfo *info = new QmakeBuildInfo(factory);
+ if (makefileBuildConfig.first | QtSupport::BaseQtVersion::DebugBuild) {
+ info->type = ProjectExplorer::BuildConfiguration::Debug;
+ info->displayName = QCoreApplication::translate("Qt4ProjectManager::Internal::QmakeProjectImporter", "Debug");
+ } else {
+ info->type = ProjectExplorer::BuildConfiguration::Release;
+ info->displayName = QCoreApplication::translate("Qt4ProjectManager::Internal::QmakeProjectImporter", "Release");
+ }
+ info->kitId = k->id();
+ info->buildDirectory = Utils::FileName::fromString(fi.absoluteFilePath());
+ info->additionalArguments = additionalArguments;
+ info->makefile = makefile;
+
+ result << info;
+ }
+ }
+
+ if (result.isEmpty() && !silent)
+ QMessageBox::critical(Core::ICore::mainWindow(),
+ QCoreApplication::translate("Qt4ProjectManager::Internal::QmakeProjectImporter", "No Build Found"),
+ QCoreApplication::translate("Qt4ProjectManager::Internal::QmakeProjectImporter", "No build found in %1 matching project %2.")
+ .arg(importPath.toUserOutput()).arg(projectFilePath()));
+
+ return result;
+}
+
+QStringList QmakeProjectImporter::importCandidates(const Utils::FileName &projectPath)
+{
+ QStringList candidates;
+
+ QFileInfo pfi = projectPath.toFileInfo();
+ const QString prefix = pfi.baseName();
+ candidates << pfi.absolutePath();
+
+ QList<ProjectExplorer::Kit *> kitList = ProjectExplorer::KitManager::kits();
+ foreach (ProjectExplorer::Kit *k, kitList) {
+ QFileInfo fi(Qt4Project::shadowBuildDirectory(projectPath.toString(), k, QString()));
+ const QString baseDir = fi.absolutePath();
+
+ foreach (const QString &dir, QDir(baseDir).entryList()) {
+ const QString path = baseDir + QLatin1Char('/') + dir;
+ if (dir.startsWith(prefix) && !candidates.contains(path))
+ candidates << path;
+ }
+ }
+ return candidates;
+}
+
+ProjectExplorer::Target *QmakeProjectImporter::preferredTarget(const QList<ProjectExplorer::Target *> &possibleTargets)
+{
+ // Select active target
+ // a) The default target
+ // b) Simulator target
+ // c) Desktop target
+ // d) the first target
+ ProjectExplorer::Target *activeTarget = possibleTargets.isEmpty() ? 0 : possibleTargets.at(0);
+ int activeTargetPriority = 0;
+ foreach (ProjectExplorer::Target *t, possibleTargets) {
+ QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(t->kit());
+ if (t->kit() == ProjectExplorer::KitManager::defaultKit()) {
+ activeTarget = t;
+ activeTargetPriority = 3;
+ } else if (activeTargetPriority < 2 && version && version->type() == QLatin1String(QtSupport::Constants::SIMULATORQT)) {
+ activeTarget = t;
+ activeTargetPriority = 2;
+ } else if (activeTargetPriority < 1 && version && version->type() == QLatin1String(QtSupport::Constants::DESKTOPQT)) {
+ activeTarget = t;
+ activeTargetPriority = 1;
+ }
+ }
+ return activeTarget;
+}
+
+void QmakeProjectImporter::cleanupKit(ProjectExplorer::Kit *k)
+{
+ QtSupport::BaseQtVersion *version = QtSupport::QtVersionManager::version(k->value(QT_IS_TEMPORARY, -1).toInt());
+ if (version)
+ QtSupport::QtVersionManager::removeVersion(version);
+}
+
+ProjectExplorer::Kit *QmakeProjectImporter::createTemporaryKit(QtSupport::BaseQtVersion *version,
+ bool temporaryVersion,
+ const Utils::FileName &parsedSpec)
+{
+ ProjectExplorer::Kit *k = new ProjectExplorer::Kit;
+ QtSupport::QtKitInformation::setQtVersion(k, version);
+ ProjectExplorer::ToolChainKitInformation::setToolChain(k, version->preferredToolChain(parsedSpec));
+ QmakeKitInformation::setMkspec(k, parsedSpec);
+
+ markTemporary(k);
+ if (temporaryVersion)
+ k->setValue(QT_IS_TEMPORARY, version->uniqueId());
+
+ k->setDisplayName(version->displayName());
+ setIsUpdating(true);
+ ProjectExplorer::KitManager::registerKit(k);
+ setIsUpdating(false);
+ return k;
+}
+
+} // namespace Internal
+} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/buildconfigurationinfo.h b/src/plugins/qt4projectmanager/qmakeprojectimporter.h
similarity index 54%
rename from src/plugins/qt4projectmanager/buildconfigurationinfo.h
rename to src/plugins/qt4projectmanager/qmakeprojectimporter.h
index a784416e0a1..4ab5be811d8 100644
--- a/src/plugins/qt4projectmanager/buildconfigurationinfo.h
+++ b/src/plugins/qt4projectmanager/qmakeprojectimporter.h
@@ -27,48 +27,38 @@
**
****************************************************************************/
-#ifndef BUILDCONFIGURATIONINFO_H
-#define BUILDCONFIGURATIONINFO_H
+#ifndef QMAKEPROJECTIMPORTER_H
+#define QMAKEPROJECTIMPORTER_H
-#include "qt4projectmanager_global.h"
+#include <projectexplorer/projectimporter.h>
-#include <qtsupport/baseqtversion.h>
+namespace QtSupport { class BaseQtVersion; }
namespace Qt4ProjectManager {
-class QT4PROJECTMANAGER_EXPORT BuildConfigurationInfo
+class Qt4Project;
+
+namespace Internal {
+
+// Documentation inside.
+class QmakeProjectImporter : public ProjectExplorer::ProjectImporter
{
public:
- explicit BuildConfigurationInfo()
- : buildConfig(QtSupport::BaseQtVersion::QmakeBuildConfig(0)), importing(false)
- { }
+ QmakeProjectImporter(const QString &path);
- explicit BuildConfigurationInfo(QtSupport::BaseQtVersion::QmakeBuildConfigs bc,
- const QString &aa, const QString &d,
- bool importing_ = false,
- const QString &makefile_ = QString())
- : buildConfig(bc),
- additionalArguments(aa), directory(d),
- importing(importing_),
- makefile(makefile_)
- { }
+ QList<ProjectExplorer::BuildInfo *> import(const Utils::FileName &importPath, bool silent = false);
+ QStringList importCandidates(const Utils::FileName &projectFilePath);
+ ProjectExplorer::Target *preferredTarget(const QList<ProjectExplorer::Target *> &possibleTargets);
- bool operator ==(const BuildConfigurationInfo &other) const
- {
- return buildConfig == other.buildConfig
- && additionalArguments == other.additionalArguments
- && directory == other.directory
- && importing == other.importing
- && makefile == other.makefile;
- }
+ void cleanupKit(ProjectExplorer::Kit *k);
- QtSupport::BaseQtVersion::QmakeBuildConfigs buildConfig;
- QString additionalArguments;
- QString directory;
- bool importing;
- QString makefile;
+private:
+ ProjectExplorer::Kit *createTemporaryKit(QtSupport::BaseQtVersion *version,
+ bool temporaryVersion,
+ const Utils::FileName &parsedSpec);
};
+} // namespace Internal
} // namespace Qt4ProjectManager
-#endif // BUILDCONFIGURATIONINFO_H
+#endif // QMAKEPROJECTIMPORTER_H
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 99bff9e930c..c3a1b9959fd 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -29,7 +29,6 @@
#include "qt4buildconfiguration.h"
-#include "buildconfigurationinfo.h"
#include "qmakebuildinfo.h"
#include "qt4project.h"
#include "qt4projectconfigwidget.h"
@@ -58,6 +57,20 @@
namespace Qt4ProjectManager {
+// --------------------------------------------------------------------
+// Helpers:
+// --------------------------------------------------------------------
+
+static Utils::FileName defaultBuildDirectory(bool supportsShadowBuild,
+ const QString &projectPath,
+ const ProjectExplorer::Kit *k,
+ const QString &suffix)
+{
+ if (supportsShadowBuild)
+ return Utils::FileName::fromString(Qt4Project::shadowBuildDirectory(projectPath, k, suffix));
+ return Utils::FileName::fromString(ProjectExplorer::Project::projectDirectory(projectPath));
+}
+
using namespace Internal;
using namespace ProjectExplorer;
using namespace QtSupport;
@@ -550,10 +563,8 @@ QmakeBuildInfo *Qt4BuildConfigurationFactory::createBuildInfo(const Kit *k,
// Leave info->buildDirectory unset;
info->kitId = k->id();
info->supportsShadowBuild = (version && version->supportsShadowBuilds());
- if (info->supportsShadowBuild)
- info->buildDirectory = Utils::FileName::fromString(Qt4Project::shadowBuildDirectory(projectPath, k, info->displayName));
- else
- info->buildDirectory = Utils::FileName::fromString(ProjectExplorer::Project::projectDirectory(projectPath));
+ info->buildDirectory
+ = defaultBuildDirectory(info->supportsShadowBuild, projectPath, k, info->displayName);
info->type = type;
return info;
}
@@ -571,11 +582,30 @@ QList<BuildInfo *> Qt4BuildConfigurationFactory::availableBuilds(const Target *p
QmakeBuildInfo *info = createBuildInfo(parent->kit(), parent->project()->projectFilePath(),
BuildConfiguration::Debug);
info->displayName.clear(); // ask for a name
+ info->buildDirectory.clear(); // This depends on the displayName
result << info;
return result;
}
+bool Qt4BuildConfigurationFactory::canSetup(const Kit *k, const QString &projectPath) const
+{
+ return k && QtSupport::QtKitInformation::qtVersion(k)
+ && Core::MimeDatabase::findByFile(QFileInfo(projectPath))
+ .matchesType(QLatin1String(Constants::PROFILE_MIMETYPE));
+}
+
+QList<BuildInfo *> Qt4BuildConfigurationFactory::availableSetups(const Kit *k, const QString &projectPath) const
+{
+ QList<ProjectExplorer::BuildInfo *> result;
+ QTC_ASSERT(canSetup(k, projectPath), return result);
+
+ result << createBuildInfo(k, projectPath, ProjectExplorer::BuildConfiguration::Debug);
+ result << createBuildInfo(k, projectPath, ProjectExplorer::BuildConfiguration::Release);
+
+ return result;
+}
+
BuildConfiguration *Qt4BuildConfigurationFactory::create(Target *parent, const BuildInfo *info) const
{
QTC_ASSERT(canCreate(parent), return 0);
@@ -594,11 +624,44 @@ BuildConfiguration *Qt4BuildConfigurationFactory::create(Target *parent, const B
else
config |= QtSupport::BaseQtVersion::DebugBuild;
- BuildConfiguration *bc
- = Qt4BuildConfiguration::setup(parent, info->displayName, info->displayName,
- config, qmakeInfo->additionalArguments,
- info->buildDirectory.toString(), false);
+ Qt4BuildConfiguration *bc = new Qt4BuildConfiguration(parent);
+ bc->setDefaultDisplayName(info->displayName);
+ bc->setDisplayName(info->displayName);
+
+ BuildStepList *buildSteps = bc->stepList(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD));
+ BuildStepList *cleanSteps = bc->stepList(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN));
+ Q_ASSERT(buildSteps);
+ Q_ASSERT(cleanSteps);
+
+ QMakeStep *qmakeStep = new QMakeStep(buildSteps);
+ buildSteps->insertStep(0, qmakeStep);
+
+ MakeStep *makeStep = new MakeStep(buildSteps);
+ buildSteps->insertStep(1, makeStep);
+
+ MakeStep *cleanStep = new MakeStep(cleanSteps);
+ cleanStep->setClean(true);
+ cleanStep->setUserArguments(QLatin1String("clean"));
+ cleanSteps->insertStep(0, cleanStep);
+
+ QString additionalArguments = qmakeInfo->additionalArguments;
+
+ bool enableQmlDebugger
+ = Qt4BuildConfiguration::removeQMLInspectorFromArguments(&additionalArguments);
+ if (!additionalArguments.isEmpty())
+ qmakeStep->setUserArguments(additionalArguments);
+ qmakeStep->setLinkQmlDebuggingLibrary(enableQmlDebugger);
+
+ bc->setQMakeBuildConfiguration(config);
+
+ Utils::FileName directory = qmakeInfo->buildDirectory;
+ if (directory.isEmpty()) {
+ directory = defaultBuildDirectory(qmakeInfo->supportsShadowBuild,
+ parent->project()->projectFilePath(),
+ parent->kit(), info->displayName);
+ }
+ bc->setBuildDirectory(directory);
return bc;
}
@@ -633,35 +696,6 @@ BuildConfiguration *Qt4BuildConfigurationFactory::restore(Target *parent, const
return 0;
}
-QList<BuildConfigurationInfo> Qt4BuildConfigurationFactory::availableBuildConfigurations(const Kit *k,
- const QString &proFilePath)
-{
- QList<BuildConfigurationInfo> infoList;
-
- BaseQtVersion *version = QtKitInformation::qtVersion(k);
- if (!version || !version->isValid())
- return infoList;
- BaseQtVersion::QmakeBuildConfigs config = version->defaultBuildConfig() | QtSupport::BaseQtVersion::DebugBuild;
- BuildConfigurationInfo info = BuildConfigurationInfo(config, QString(), QString(), false);
- info.directory = Qt4Project::shadowBuildDirectory(proFilePath, k, buildConfigurationDisplayName(info));
- infoList.append(info);
-
- info.buildConfig = config ^ BaseQtVersion::DebugBuild;
- info.directory = Qt4Project::shadowBuildDirectory(proFilePath, k, buildConfigurationDisplayName(info));
- infoList.append(info);
- return infoList;
-}
-
-// Return name of a build configuration.
-QString Qt4BuildConfigurationFactory::buildConfigurationDisplayName(const BuildConfigurationInfo &info)
-{
- return (info.buildConfig & BaseQtVersion::DebugBuild) ?
- //: Name of a debug build configuration to created by a project wizard. We recommend not translating it.
- tr("Debug") :
- //: Name of a release build configuration to be created by a project wizard. We recommend not translating it.
- tr("Release");
-}
-
BuildConfiguration::BuildType Qt4BuildConfiguration::buildType() const
{
if (qmakeBuildConfiguration() & BaseQtVersion::DebugBuild)
@@ -670,52 +704,6 @@ BuildConfiguration::BuildType Qt4BuildConfiguration::buildType() const
return Release;
}
-Qt4BuildConfiguration *Qt4BuildConfiguration::setup(Target *t, QString defaultDisplayName,
- QString displayName,
- BaseQtVersion::QmakeBuildConfigs qmakeBuildConfiguration,
- QString additionalArguments, QString directory,
- bool importing)
-{
- Q_UNUSED(importing);
-
- // Add the build configuration.
- Qt4BuildConfiguration *bc = new Qt4BuildConfiguration(t);
- bc->setDefaultDisplayName(defaultDisplayName);
- bc->setDisplayName(displayName);
-
- BuildStepList *buildSteps = bc->stepList(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD));
- BuildStepList *cleanSteps = bc->stepList(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_CLEAN));
- Q_ASSERT(buildSteps);
- Q_ASSERT(cleanSteps);
-
- QMakeStep *qmakeStep = new QMakeStep(buildSteps);
- buildSteps->insertStep(0, qmakeStep);
-
- MakeStep *makeStep = new MakeStep(buildSteps);
- buildSteps->insertStep(1, makeStep);
-
- MakeStep *cleanStep = new MakeStep(cleanSteps);
- cleanStep->setClean(true);
- cleanStep->setUserArguments(QLatin1String("clean"));
- cleanSteps->insertStep(0, cleanStep);
-
- bool enableQmlDebugger
- = Qt4BuildConfiguration::removeQMLInspectorFromArguments(&additionalArguments);
-
- if (!additionalArguments.isEmpty())
- qmakeStep->setUserArguments(additionalArguments);
- qmakeStep->setLinkQmlDebuggingLibrary(enableQmlDebugger);
-
- bc->setQMakeBuildConfiguration(qmakeBuildConfiguration);
-
- if (directory.isEmpty())
- bc->setBuildDirectory(Utils::FileName::fromString(t->project()->projectDirectory()));
- else
- bc->setBuildDirectory(Utils::FileName::fromString(directory));
-
- return bc;
-}
-
Qt4BuildConfiguration::LastKitState::LastKitState()
{
@@ -743,6 +731,4 @@ bool Qt4BuildConfiguration::LastKitState::operator !=(const LastKitState &other)
return !operator ==(other);
}
-
-
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
index 18c76391d20..52ebb9df9a3 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h
@@ -44,7 +44,6 @@ class QMakeStep;
class MakeStep;
class Qt4BuildConfigurationFactory;
class Qt4ProFileNode;
-class BuildConfigurationInfo;
namespace Internal { class Qt4ProjectConfigWidget; }
@@ -103,13 +102,6 @@ public:
BuildType buildType() const;
- static Qt4BuildConfiguration *setup(ProjectExplorer::Target *t,
- QString defaultDisplayName,
- QString displayName,
- QtSupport::BaseQtVersion::QmakeBuildConfigs qmakeBuildConfiguration,
- QString additionalArguments,
- QString directory,
- bool importing);
/// returns whether the Qt version in the profile supports shadow building (also true for no Qt version)
bool supportsShadowBuilds();
@@ -161,6 +153,7 @@ private:
ProjectExplorer::FileNode *m_fileNodeBuild;
friend class Internal::Qt4ProjectConfigWidget;
+ friend class Qt4BuildConfigurationFactory;
};
class QT4PROJECTMANAGER_EXPORT Qt4BuildConfigurationFactory : public ProjectExplorer::IBuildConfigurationFactory
@@ -173,6 +166,9 @@ public:
bool canCreate(const ProjectExplorer::Target *parent) const;
QList<ProjectExplorer::BuildInfo *> availableBuilds(const ProjectExplorer::Target *parent) const;
+ bool canSetup(const ProjectExplorer::Kit *k, const QString &projectPath) const;
+ QList<ProjectExplorer::BuildInfo *> availableSetups(const ProjectExplorer::Kit *k,
+ const QString &projectPath) const;
ProjectExplorer::BuildConfiguration *create(ProjectExplorer::Target *parent,
const ProjectExplorer::BuildInfo *info) const;
@@ -181,9 +177,6 @@ public:
bool canRestore(const ProjectExplorer::Target *parent, const QVariantMap &map) const;
ProjectExplorer::BuildConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map);
- static QList<BuildConfigurationInfo> availableBuildConfigurations(const ProjectExplorer::Kit *k, const QString &proFilePath);
- static QString buildConfigurationDisplayName(const BuildConfigurationInfo &info);
-
private slots:
void update();
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index 08086eca6f5..2e48fcc9048 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -30,12 +30,13 @@
#include "qt4project.h"
#include "qt4projectmanager.h"
+#include "qmakeprojectimporter.h"
+#include "qmakebuildinfo.h"
#include "qmakestep.h"
#include "qt4nodes.h"
#include "qt4projectmanagerconstants.h"
#include "qt4buildconfiguration.h"
#include "findqt4profiles.h"
-#include "buildconfigurationinfo.h"
#include "qt4projectmanager/wizards/abstractmobileapp.h"
#include "qt4projectmanager/wizards/qtquickapp.h"
#include "qt4projectmanager/wizards/html5app.h"
@@ -380,32 +381,6 @@ void Qt4Project::updateFileList()
}
}
-bool Qt4Project::setupTarget(ProjectExplorer::Target *t)
-{
- QList<BuildConfigurationInfo> infoList
- = Qt4BuildConfigurationFactory::availableBuildConfigurations(t->kit(), m_fileInfo->filePath());
- setupTarget(t, infoList);
- return true;
-}
-
-void Qt4Project::setupTarget(ProjectExplorer::Target *t, const QList<BuildConfigurationInfo> &infoList)
-{
- // Build Configurations:
- foreach (const BuildConfigurationInfo &info, infoList) {
- QString name = info.buildConfig & QtSupport::BaseQtVersion::DebugBuild
- ? tr("Debug") : tr("Release");
- Qt4BuildConfiguration *bc
- = Qt4BuildConfiguration::setup(t, name, name,
- info.buildConfig, info.additionalArguments,
- info.directory, info.importing);
- t->addBuildConfiguration(bc);
- }
-
- // Deploy Configurations:
- t->updateDefaultDeployConfigurations();
- // Do not create Run Configurations: Those will be generated later anyway.
-}
-
bool Qt4Project::fromMap(const QVariantMap &map)
{
if (!Project::fromMap(map))
@@ -1389,6 +1364,7 @@ bool Qt4Project::needsConfiguration() const
void Qt4Project::configureAsExampleProject(const QStringList &platforms)
{
+ QList<const BuildInfo *> infoList;
QList<Kit *> kits = ProjectExplorer::KitManager::kits();
foreach (Kit *k, kits) {
QtSupport::BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(k);
@@ -1397,12 +1373,14 @@ void Qt4Project::configureAsExampleProject(const QStringList &platforms)
if (!platforms.isEmpty() && !platforms.contains(version->platformName()))
continue;
- QList<BuildConfigurationInfo> infoList
- = Qt4BuildConfigurationFactory::availableBuildConfigurations(k, projectFilePath());
- if (infoList.isEmpty())
+ IBuildConfigurationFactory *factory = IBuildConfigurationFactory::find(k, projectFilePath());
+ if (!factory)
continue;
- addTarget(createTarget(k, infoList));
+ foreach (BuildInfo *info, factory->availableSetups(k, projectFilePath()))
+ infoList << info;
}
+ setup(infoList);
+ qDeleteAll(infoList);
ProjectExplorer::ProjectExplorerPlugin::instance()->requestProjectModeUpdate(this);
}
@@ -1456,16 +1434,6 @@ QString Qt4Project::buildNameFor(const Kit *k)
return k->fileSystemFriendlyName();
}
-Target *Qt4Project::createTarget(Kit *k, const QList<BuildConfigurationInfo> &infoList)
-{
- if (target(k))
- return 0;
-
- Target *t = new Target(this, k);
- setupTarget(t, infoList);
- return t;
-}
-
void Qt4Project::updateBuildSystemData()
{
Target * const target = activeTarget();
@@ -1653,6 +1621,12 @@ void Qt4Project::emitBuildDirectoryInitialized()
{
emit buildDirectoryInitialized();
}
+
+ProjectImporter *Qt4Project::createProjectImporter() const
+{
+ return new QmakeProjectImporter(projectFilePath());
+}
+
} // namespace Qt4ProjectManager
#include "qt4project.moc"
diff --git a/src/plugins/qt4projectmanager/qt4project.h b/src/plugins/qt4projectmanager/qt4project.h
index 474fe49e386..751a22c01c7 100644
--- a/src/plugins/qt4projectmanager/qt4project.h
+++ b/src/plugins/qt4projectmanager/qt4project.h
@@ -49,7 +49,6 @@ namespace ProjectExplorer { class DeploymentData; }
namespace QtSupport { class ProFileReader; }
namespace Qt4ProjectManager {
-class BuildConfigurationInfo;
class MakeStep;
class QMakeStep;
class Qt4BuildConfiguration;
@@ -139,10 +138,10 @@ public:
/// used by the default implementation of shadowBuildDirectory
static QString buildNameFor(const ProjectExplorer::Kit *k);
- ProjectExplorer::Target *createTarget(ProjectExplorer::Kit *k, const QList<BuildConfigurationInfo> &infoList);
-
void emitBuildDirectoryInitialized();
+ ProjectExplorer::ProjectImporter *createProjectImporter() const;
+
signals:
void proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *node, bool, bool);
void buildDirectoryInitialized();
@@ -155,8 +154,6 @@ public slots:
protected:
bool fromMap(const QVariantMap &map);
- bool setupTarget(ProjectExplorer::Target *t);
- void setupTarget(ProjectExplorer::Target *t, const QList<BuildConfigurationInfo> &infoList);
private slots:
void asyncUpdate();
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index 9a0bb33d45a..a336ae54a04 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -8,6 +8,7 @@ HEADERS += \
qmakebuildinfo.h \
qmakekitinformation.h \
qmakekitconfigwidget.h \
+ qmakeprojectimporter.h \
qmakerunconfigurationfactory.h \
qt4projectmanagerplugin.h \
qt4projectmanager.h \
@@ -38,8 +39,6 @@ HEADERS += \
wizards/modulespage.h \
wizards/filespage.h \
wizards/qtwizard.h \
- wizards/targetsetuppage.h \
- wizards/importwidget.h \
wizards/qtquickapp.h \
wizards/qtquickappwizard.h \
wizards/qtquickappwizardpages.h \
@@ -62,16 +61,14 @@ HEADERS += \
librarydetailscontroller.h \
findqt4profiles.h \
qt4projectmanager_global.h \
- qt4targetsetupwidget.h \
- buildconfigurationinfo.h \
winceqtversionfactory.h \
winceqtversion.h \
- profilecompletionassist.h \
- unconfiguredprojectpanel.h
+ profilecompletionassist.h
SOURCES += \
qmakekitconfigwidget.cpp \
qmakekitinformation.cpp \
+ qmakeprojectimporter.cpp \
qmakerunconfigurationfactory.cpp \
qt4projectmanagerplugin.cpp \
qt4projectmanager.cpp \
@@ -102,8 +99,6 @@ SOURCES += \
wizards/modulespage.cpp \
wizards/filespage.cpp \
wizards/qtwizard.cpp \
- wizards/targetsetuppage.cpp \
- wizards/importwidget.cpp \
wizards/qtquickapp.cpp \
wizards/qtquickappwizard.cpp \
wizards/qtquickappwizardpages.cpp \
@@ -124,11 +119,9 @@ SOURCES += \
addlibrarywizard.cpp \
librarydetailscontroller.cpp \
findqt4profiles.cpp \
- qt4targetsetupwidget.cpp \
winceqtversionfactory.cpp \
winceqtversion.cpp \
- profilecompletionassist.cpp \
- unconfiguredprojectpanel.cpp
+ profilecompletionassist.cpp
FORMS += makestep.ui \
qmakestep.ui \
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.qbs b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
index 7ab01103072..90ee461949b 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.qbs
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.qbs
@@ -54,7 +54,6 @@ QtcPlugin {
"qt4projectmanagerplugin.cpp", "qt4projectmanagerplugin.h",
"qt4targetsetupwidget.cpp", "qt4targetsetupwidget.h",
"qtmodulesinfo.cpp", "qtmodulesinfo.h",
- "unconfiguredprojectpanel.cpp", "unconfiguredprojectpanel.h",
"winceqtversion.cpp", "winceqtversion.h",
"winceqtversionfactory.cpp", "winceqtversionfactory.h"
]
@@ -117,7 +116,6 @@ QtcPlugin {
"html5appwizard.cpp", "html5appwizard.h",
"html5appwizardpages.cpp", "html5appwizardpages.h",
"html5appwizardsourcespage.ui",
- "importwidget.cpp", "importwidget.h",
"libraryparameters.cpp", "libraryparameters.h",
"librarywizard.cpp", "librarywizard.h",
"librarywizarddialog.cpp", "librarywizarddialog.h",
@@ -137,7 +135,6 @@ QtcPlugin {
"qtwizard.cpp", "qtwizard.h",
"subdirsprojectwizard.cpp", "subdirsprojectwizard.h",
"subdirsprojectwizarddialog.cpp", "subdirsprojectwizarddialog.h",
- "targetsetuppage.cpp", "targetsetuppage.h",
"testwizard.cpp", "testwizard.h",
"testwizarddialog.cpp", "testwizarddialog.h",
"testwizardpage.cpp", "testwizardpage.h",
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index 68ccdb3d327..2845852eb84 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -90,9 +90,6 @@ const char QMAKEVAR_QMLJSDEBUGGER_PATH[] = "QMLJSDEBUGGER_PATH";
const char QMAKEVAR_QUICK1_DEBUG[] = "CONFIG+=declarative_debug";
const char QMAKEVAR_QUICK2_DEBUG[] = "CONFIG+=qml_debug";
-// Unconfigured Panel
-const char UNCONFIGURED_PANEL_PAGE_ID[] = "UnconfiguredPanel";
-
} // namespace Constants
} // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 69453439f12..d23d8045a6a 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -53,7 +53,6 @@
#include "qt-desktop/desktopqtversionfactory.h"
#include "qt-desktop/simulatorqtversionfactory.h"
#include "winceqtversionfactory.h"
-#include "unconfiguredprojectpanel.h"
#include "qmakekitinformation.h"
#include "profilehighlighterfactory.h"
@@ -156,7 +155,6 @@ bool Qt4ProjectManagerPlugin::initialize(const QStringList &arguments, QString *
addAutoReleasedObject(new ProFileCompletionAssistProvider);
addAutoReleasedObject(new ProFileHoverHandler(this));
- addAutoReleasedObject(new UnconfiguredProjectPanel);
addAutoReleasedObject(new ProFileHighlighterFactory);
//menus
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
index 9be35ad1700..8b94e4cdf6a 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
@@ -30,7 +30,7 @@
#include "abstractmobileappwizard.h"
#include "mobileappwizardpages.h"
-#include "targetsetuppage.h"
+#include "../qmakeprojectimporter.h"
#include <extensionsystem/pluginmanager.h>
#include <qt4projectmanager/qt4project.h>
@@ -38,6 +38,7 @@
#include <qtsupport/qtsupportconstants.h>
#include <qtsupport/qtkitinformation.h>
#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/targetsetuppage.h>
#include <projectexplorer/customwizard/customwizard.h>
#include <coreplugin/editormanager/editormanager.h>
@@ -64,7 +65,8 @@ AbstractMobileAppWizardDialog::AbstractMobileAppWizardDialog(QWidget *parent,
.value<QList<Core::Id> >())
{
if (!parameters.extraValues().contains(QLatin1String(ProjectExplorer::Constants::PROJECT_KIT_IDS))) {
- m_targetsPage = new TargetSetupPage;
+ m_targetsPage = new ProjectExplorer::TargetSetupPage;
+ m_targetsPage->setProjectImporter(new Internal::QmakeProjectImporter(path()));
QString platform = selectedPlatform();
if (platform.isEmpty()) {
m_targetsPage->setPreferredKitMatcher(
@@ -120,7 +122,7 @@ void AbstractMobileAppWizardDialog::addMobilePages()
m_targetItem->setNextShownItem(0);
}
-TargetSetupPage *AbstractMobileAppWizardDialog::targetsPage() const
+ProjectExplorer::TargetSetupPage *AbstractMobileAppWizardDialog::targetsPage() const
{
return m_targetsPage;
}
@@ -295,7 +297,7 @@ void AbstractMobileAppWizard::useProjectPath(const QString &projectName,
app()->setProjectName(projectName);
app()->setProjectPath(projectPath);
if (wizardDialog()->m_targetsPage)
- wizardDialog()->m_targetsPage->setProFilePath(app()->path(AbstractMobileApp::AppPro));
+ wizardDialog()->m_targetsPage->setProjectPath(app()->path(AbstractMobileApp::AppPro));
projectPathChanged(app()->path(AbstractMobileApp::AppPro));
}
diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
index 4062f17cdba..cfb2a997f89 100644
--- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h
@@ -33,6 +33,8 @@
#include <qt4projectmanager/qt4projectmanager_global.h>
#include <projectexplorer/baseprojectwizarddialog.h>
+namespace ProjectExplorer { class TargetSetupPage; }
+
namespace QtSupport {
class QtVersionNumber;
class QtVersionManager;
@@ -41,7 +43,6 @@ class QtVersionManager;
namespace Qt4ProjectManager {
class AbstractMobileApp;
-class TargetSetupPage;
namespace Internal {
class MobileAppWizardGenericOptionsPage;
@@ -61,7 +62,7 @@ protected:
void addMobilePages();
public:
- TargetSetupPage *targetsPage() const;
+ ProjectExplorer::TargetSetupPage *targetsPage() const;
protected:
int addPageWithTitle(QWizardPage *page, const QString &title);
@@ -80,7 +81,7 @@ private:
Internal::MobileAppWizardGenericOptionsPage *m_genericOptionsPage;
Internal::MobileAppWizardMaemoOptionsPage *m_maemoOptionsPage;
Internal::MobileAppWizardHarmattanOptionsPage *m_harmattanOptionsPage;
- TargetSetupPage *m_targetsPage;
+ ProjectExplorer::TargetSetupPage *m_targetsPage;
int m_genericOptionsPageId;
int m_maemoOptionsPageId;
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
index 754c16859a6..854377dd17e 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizard.cpp
@@ -31,11 +31,11 @@
#include "html5app.h"
#include "html5appwizardpages.h"
-#include "targetsetuppage.h"
#include <qt4projectmanager/qt4projectmanagerconstants.h>
#include <qtsupport/baseqtversion.h>
#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/targetsetuppage.h>
#include <qtsupport/qtsupportconstants.h>
#include <limits>
@@ -115,7 +115,7 @@ AbstractMobileAppWizardDialog *Html5AppWizard::createWizardDialogInternal(QWidge
void Html5AppWizard::projectPathChanged(const QString &path) const
{
if (d->wizardDialog->targetsPage())
- d->wizardDialog->targetsPage()->setProFilePath(path);
+ d->wizardDialog->targetsPage()->setProjectPath(path);
}
void Html5AppWizard::prepareGenerateFiles(const QWizard *w,
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index 04afef13f27..660fcba083a 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -31,12 +31,12 @@
#include "qtquickapp.h"
#include "qtquickappwizardpages.h"
-#include "targetsetuppage.h"
-#include <qt4projectmanager/qt4projectmanagerconstants.h>
+#include "qt4projectmanagerconstants.h"
#include <qtsupport/qtsupportconstants.h>
#include <qtsupport/baseqtversion.h>
#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/targetsetuppage.h>
#include <QIcon>
#include <QDebug>
@@ -226,7 +226,7 @@ AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWid
void QtQuickAppWizard::projectPathChanged(const QString &path) const
{
if (d->wizardDialog->targetsPage())
- d->wizardDialog->targetsPage()->setProFilePath(path);
+ d->wizardDialog->targetsPage()->setProjectPath(path);
}
void QtQuickAppWizard::prepareGenerateFiles(const QWizard *w,
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
index d1629e5f5c1..78d4a6a3cb0 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
@@ -30,7 +30,6 @@
#include "qtwizard.h"
#include "modulespage.h"
-#include "targetsetuppage.h"
#include <qt4projectmanager/qt4project.h>
#include <qt4projectmanager/qt4projectmanager.h>
@@ -41,6 +40,7 @@
#include <cpptools/cpptoolsconstants.h>
#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/targetsetuppage.h>
#include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h>
@@ -212,7 +212,7 @@ int BaseQt4ProjectWizardDialog::addModulesPage(int id)
int BaseQt4ProjectWizardDialog::addTargetSetupPage(bool mobile, int id)
{
- m_targetSetupPage = new TargetSetupPage;
+ m_targetSetupPage = new ProjectExplorer::TargetSetupPage;
const QString platform = selectedPlatform();
Core::FeatureSet features = mobile ? Core::FeatureSet(QtSupport::Constants::FEATURE_MOBILE)
: Core::FeatureSet(QtSupport::Constants::FEATURE_DESKTOP);
@@ -323,5 +323,5 @@ void BaseQt4ProjectWizardDialog::generateProfileName(const QString &name, const
QDir::cleanPath(path + QLatin1Char('/') + name + QLatin1Char('/')
+ name + QLatin1String(".pro"));
- m_targetSetupPage->setProFilePath(proFile);
+ m_targetSetupPage->setProjectPath(proFile);
}
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h
index 459dc61629b..bb78c12d6c4 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h
@@ -34,12 +34,14 @@
#include <projectexplorer/baseprojectwizarddialog.h>
#include <projectexplorer/customwizard/customwizard.h>
-namespace ProjectExplorer { class Kit; }
+namespace ProjectExplorer {
+class Kit;
+class TargetSetupPage;
+} // namespace ProjectExplorer
namespace Qt4ProjectManager {
class Qt4Project;
-class TargetSetupPage;
namespace Internal {
@@ -142,7 +144,7 @@ private:
inline void init(bool showModulesPage);
ModulesPage *m_modulesPage;
- TargetSetupPage *m_targetSetupPage;
+ ProjectExplorer::TargetSetupPage *m_targetSetupPage;
QStringList m_selectedModules;
QStringList m_deselectedModules;
QList<Core::Id> m_profileIds;
diff --git a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp b/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
deleted file mode 100644
index 350bd821bb3..00000000000
--- a/src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
+++ /dev/null
@@ -1,731 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 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.
-**
-****************************************************************************/
-
-#include "targetsetuppage.h"
-#include "importwidget.h"
-#include "../qt4targetsetupwidget.h"
-
-#include <qt4projectmanager/buildconfigurationinfo.h>
-#include <qt4projectmanager/qt4buildconfiguration.h>
-#include <qt4projectmanager/qt4project.h>
-#include <qt4projectmanager/qmakekitinformation.h>
-
-#include <coreplugin/icore.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/target.h>
-#include <qtsupport/qtkitinformation.h>
-#include <qtsupport/qtsupportconstants.h>
-#include <qtsupport/qtversionfactory.h>
-#include <qtsupport/qtversionmanager.h>
-#include <utils/qtcprocess.h>
-
-#include <QLabel>
-#include <QMessageBox>
-#include <QScrollArea>
-#include <QVBoxLayout>
-
-using namespace ProjectExplorer;
-using namespace QtSupport;
-
-namespace Qt4ProjectManager {
-namespace Internal {
-
-static const Core::Id QT_IS_TEMPORARY("Qt4PM.TempQt");
-static const Core::Id KIT_IS_TEMPORARY("Qt4PM.TempKit");
-static const Core::Id KIT_TEMPORARY_NAME("Qt4PM.TempName");
-static const Core::Id KIT_FINAL_NAME("Qt4PM.FinalName");
-static const Core::Id TEMPORARY_OF_PROJECTS("Qt4PM.TempProject");
-
-class TargetSetupPageUi
-{
-public:
- QWidget *centralWidget;
- QWidget *scrollAreaWidget;
- QScrollArea *scrollArea;
- QLabel *headerLabel;
- QLabel *descriptionLabel;
- QLabel *noValidKitLabel;
- QLabel *optionHintLabel;
-
- void setupUi(QWidget *q)
- {
- QWidget *setupTargetPage = new QWidget(q);
- descriptionLabel = new QLabel(setupTargetPage);
- descriptionLabel->setWordWrap(true);
- descriptionLabel->setVisible(false);
-
- headerLabel = new QLabel(setupTargetPage);
- headerLabel->setWordWrap(true);
- headerLabel->setVisible(false);
-
- noValidKitLabel = new QLabel(setupTargetPage);
- noValidKitLabel->setWordWrap(true);
- noValidKitLabel->setText(TargetSetupPage::tr("<span style=\" font-weight:600;\">No valid kits found.</span>"));
-
-
- optionHintLabel = new QLabel(setupTargetPage);
- optionHintLabel->setWordWrap(true);
- optionHintLabel->setText(TargetSetupPage::tr(
- "Please add a kit in the <a href=\"buildandrun\">options</a> "
- "or via the maintenance tool of the SDK."));
- optionHintLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
- optionHintLabel->setVisible(false);
-
- centralWidget = new QWidget(setupTargetPage);
- QSizePolicy policy(QSizePolicy::Preferred, QSizePolicy::Fixed);
- policy.setHorizontalStretch(0);
- policy.setVerticalStretch(0);
- policy.setHeightForWidth(centralWidget->sizePolicy().hasHeightForWidth());
- centralWidget->setSizePolicy(policy);
-
- scrollAreaWidget = new QWidget(setupTargetPage);
- scrollArea = new QScrollArea(scrollAreaWidget);
- scrollArea->setWidgetResizable(true);
-
- QWidget *scrollAreaWidgetContents;
- scrollAreaWidgetContents = new QWidget();
- scrollAreaWidgetContents->setGeometry(QRect(0, 0, 230, 81));
- scrollArea->setWidget(scrollAreaWidgetContents);
-
- QVBoxLayout *verticalLayout = new QVBoxLayout(scrollAreaWidget);
- verticalLayout->setSpacing(0);
- verticalLayout->setContentsMargins(0, 0, 0, 0);
- verticalLayout->addWidget(scrollArea);
-
- QVBoxLayout *verticalLayout_2 = new QVBoxLayout(setupTargetPage);
- verticalLayout_2->addWidget(headerLabel);
- verticalLayout_2->addWidget(noValidKitLabel);
- verticalLayout_2->addWidget(descriptionLabel);
- verticalLayout_2->addWidget(optionHintLabel);
- verticalLayout_2->addWidget(centralWidget);
- verticalLayout_2->addWidget(scrollAreaWidget);
-
- QVBoxLayout *verticalLayout_3 = new QVBoxLayout(q);
- verticalLayout_3->setContentsMargins(0, 0, 0, -1);
- verticalLayout_3->addWidget(setupTargetPage);
-
- QObject::connect(optionHintLabel, SIGNAL(linkActivated(QString)),
- q, SLOT(openOptions()));
- }
-};
-
-} // namespace Internal
-
-using namespace Internal;
-
-TargetSetupPage::TargetSetupPage(QWidget *parent) :
- QWizardPage(parent),
- m_requiredMatcher(0),
- m_preferredMatcher(0),
- m_baseLayout(0),
- m_importSearch(false),
- m_ignoreUpdates(false),
- m_firstWidget(0),
- m_ui(new TargetSetupPageUi),
- m_importWidget(new Internal::ImportWidget(this)),
- m_spacer(new QSpacerItem(0,0, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding)),
- m_forceOptionHint(false)
-{
- setObjectName(QLatin1String("TargetSetupPage"));
- setWindowTitle(tr("Select Kits for Your Project"));
- m_ui->setupUi(this);
-
- QSizePolicy policy(QSizePolicy::Preferred, QSizePolicy::Preferred);
- policy.setHorizontalStretch(0);
- policy.setVerticalStretch(0);
- policy.setHeightForWidth(sizePolicy().hasHeightForWidth());
- setSizePolicy(policy);
-
- QWidget *centralWidget = new QWidget(this);
- m_ui->scrollArea->setWidget(centralWidget);
- centralWidget->setLayout(new QVBoxLayout);
- m_ui->centralWidget->setLayout(new QVBoxLayout);
- m_ui->centralWidget->layout()->setMargin(0);
-
- setUseScrollArea(true);
- setImportSearch(false);
-
- setTitle(tr("Kit Selection"));
-
- QObject *km = KitManager::instance();
- connect(km, SIGNAL(kitAdded(ProjectExplorer::Kit*)),
- this, SLOT(handleKitAddition(ProjectExplorer::Kit*)));
- connect(km, SIGNAL(kitRemoved(ProjectExplorer::Kit*)),
- this, SLOT(handleKitRemoval(ProjectExplorer::Kit*)));
- connect(km, SIGNAL(kitUpdated(ProjectExplorer::Kit*)),
- this, SLOT(handleKitUpdate(ProjectExplorer::Kit*)));
- connect(m_importWidget, SIGNAL(importFrom(Utils::FileName)),
- this, SLOT(import(Utils::FileName)));
-}
-
-void TargetSetupPage::initializePage()
-{
- reset();
-
- setupWidgets();
- setupImports();
- selectAtLeastOneKit();
-}
-
-void TargetSetupPage::setRequiredKitMatcher(ProjectExplorer::KitMatcher *matcher)
-{
- m_requiredMatcher = matcher;
-}
-
-QList<Core::Id> TargetSetupPage::selectedKits() const
-{
- QList<Core::Id> result;
- QMap<Core::Id, Qt4TargetSetupWidget *>::const_iterator it, end;
- it = m_widgets.constBegin();
- end = m_widgets.constEnd();
-
- for ( ; it != end; ++it) {
- if (isKitSelected(it.key()))
- result << it.key();
- }
- return result;
-}
-
-void TargetSetupPage::setPreferredKitMatcher(ProjectExplorer::KitMatcher *matcher)
-{
- m_preferredMatcher = matcher;
-}
-
-TargetSetupPage::~TargetSetupPage()
-{
- reset();
- delete m_ui;
- delete m_preferredMatcher;
- delete m_requiredMatcher;
-}
-
-bool TargetSetupPage::isKitSelected(Core::Id id) const
-{
- Qt4TargetSetupWidget *widget = m_widgets.value(id);
- return widget && widget->isKitSelected();
-}
-
-void TargetSetupPage::setKitSelected(Core::Id id, bool selected)
-{
- Qt4TargetSetupWidget *widget = m_widgets.value(id);
- if (widget)
- widget->setKitSelected(selected);
-}
-
-bool TargetSetupPage::isComplete() const
-{
- foreach (Qt4TargetSetupWidget *widget, m_widgets.values())
- if (widget->isKitSelected())
- return true;
- return false;
-}
-
-void TargetSetupPage::setImportSearch(bool b)
-{
- m_importSearch = b;
- m_importWidget->setVisible(b);
-}
-
-void TargetSetupPage::setupWidgets()
-{
- // Known profiles:
- QList<Kit *> kits = m_requiredMatcher
- ? KitManager::matchingKits(*m_requiredMatcher) : KitManager::kits();
- foreach (Kit *k, kits)
- addWidget(k);
-
- // Setup import widget:
- m_baseLayout->addWidget(m_importWidget);
- Utils::FileName path = Utils::FileName::fromString(m_proFilePath);
- path = path.parentDir(); // base dir
- path = path.parentDir(); // parent dir
- m_importWidget->setCurrentDirectory(path);
-
- updateVisibility();
-}
-
-void TargetSetupPage::reset()
-{
- foreach (Qt4TargetSetupWidget *widget, m_widgets.values()) {
- ProjectExplorer::Kit *k = widget->kit();
- if (!k)
- continue;
- removeProject(k, m_proFilePath);
- delete widget;
- }
-
- m_widgets.clear();
- m_firstWidget = 0;
-}
-
-ProjectExplorer::Kit *TargetSetupPage::createTemporaryKit(BaseQtVersion *version,
- bool temporaryVersion,
- const Utils::FileName &parsedSpec)
-{
- ProjectExplorer::Kit *k = new ProjectExplorer::Kit;
- QtKitInformation::setQtVersion(k, version);
- ProjectExplorer::ToolChainKitInformation::setToolChain(k, version->preferredToolChain(parsedSpec));
- QmakeKitInformation::setMkspec(k, parsedSpec);
-
- k->setDisplayName(tr("%1 - temporary").arg(version->displayName()));
- k->setValue(KIT_TEMPORARY_NAME, k->displayName());
- k->setValue(KIT_FINAL_NAME, version->displayName());
- k->setValue(KIT_IS_TEMPORARY, true);
- if (temporaryVersion)
- k->setValue(QT_IS_TEMPORARY, version->uniqueId());
-
- m_ignoreUpdates = true;
- ProjectExplorer::KitManager::registerKit(k);
- m_ignoreUpdates = false;
-
- return k;
-}
-
-void TargetSetupPage::cleanKit(ProjectExplorer::Kit *k)
-{
- m_ignoreUpdates = true;
- k->removeKey(KIT_IS_TEMPORARY);
- k->removeKey(QT_IS_TEMPORARY);
- k->removeKey(TEMPORARY_OF_PROJECTS);
- const QString tempName = k->value(KIT_TEMPORARY_NAME).toString();
- if (!tempName.isNull() && k->displayName() == tempName)
- k->setDisplayName(k->value(KIT_FINAL_NAME).toString());
- k->removeKey(KIT_TEMPORARY_NAME);
- k->removeKey(KIT_FINAL_NAME);
- m_ignoreUpdates = false;
-}
-
-void TargetSetupPage::makeQtPersistent(ProjectExplorer::Kit *k)
-{
- m_ignoreUpdates = true;
- k->removeKey(QT_IS_TEMPORARY);
- m_ignoreUpdates = false;
-}
-
-void TargetSetupPage::addProject(ProjectExplorer::Kit *k, const QString &path)
-{
- if (!k->hasValue(KIT_IS_TEMPORARY))
- return;
-
- QStringList projects = k->value(TEMPORARY_OF_PROJECTS, QStringList()).toStringList();
- if (!projects.contains(path)) {
- projects.append(path);
- m_ignoreUpdates = true;
- k->setValue(TEMPORARY_OF_PROJECTS, projects);
- m_ignoreUpdates = false;
- }
-}
-
-void TargetSetupPage::removeProject(ProjectExplorer::Kit *k, const QString &path)
-{
- if (!k->hasValue(KIT_IS_TEMPORARY) || path.isEmpty())
- return;
-
- QStringList projects = k->value(TEMPORARY_OF_PROJECTS, QStringList()).toStringList();
- if (projects.contains(path)) {
- projects.removeOne(path);
- m_ignoreUpdates = true;
- if (projects.isEmpty())
- ProjectExplorer::KitManager::deregisterKit(k);
- else
- k->setValue(TEMPORARY_OF_PROJECTS, projects);
- m_ignoreUpdates = false;
- }
-}
-
-void TargetSetupPage::setProFilePath(const QString &path)
-{
- m_proFilePath = path;
- if (!m_proFilePath.isEmpty())
- m_ui->headerLabel->setText(tr("Qt Creator can use the following kits for project <b>%1</b>:",
- "%1: Project name").arg(QFileInfo(m_proFilePath).baseName()));
- m_ui->headerLabel->setVisible(!m_proFilePath.isEmpty());
-
- if (m_widgets.isEmpty())
- return;
-
- reset();
- setupWidgets();
-}
-
-void TargetSetupPage::setNoteText(const QString &text)
-{
- m_ui->descriptionLabel->setText(text);
- m_ui->descriptionLabel->setVisible(!text.isEmpty());
-}
-
-void TargetSetupPage::showOptionsHint(bool show)
-{
- m_forceOptionHint = show;
- updateVisibility();
-}
-
-void TargetSetupPage::import(const Utils::FileName &path)
-{
- import(path, false);
-}
-
-void TargetSetupPage::import(const Utils::FileName &path, const bool silent)
-{
- QFileInfo fi = path.toFileInfo();
- if (!fi.exists() && !fi.isDir())
- return;
-
- QStringList makefiles = QDir(path.toString()).entryList(QStringList(QLatin1String("Makefile*")));
-
- BaseQtVersion *version = 0;
- bool temporaryVersion = false;
- bool found = false;
-
- foreach (const QString &file, makefiles) {
- // find interesting makefiles
- QString makefile = path.toString() + QLatin1Char('/') + file;
- Utils::FileName qmakeBinary = QtVersionManager::findQMakeBinaryFromMakefile(makefile);
- QFileInfo fi = qmakeBinary.toFileInfo();
- Utils::FileName canonicalQmakeBinary = Utils::FileName::fromString(fi.canonicalFilePath());
- if (canonicalQmakeBinary.isEmpty())
- continue;
- if (QtVersionManager::makefileIsFor(makefile, m_proFilePath) != QtVersionManager::SameProject)
- continue;
-
- // Find version:
- foreach (BaseQtVersion *v, QtVersionManager::versions()) {
- QFileInfo vfi = v->qmakeCommand().toFileInfo();
- Utils::FileName current = Utils::FileName::fromString(vfi.canonicalFilePath());
- if (current == canonicalQmakeBinary) {
- version = v;
- break;
- }
- }
-
- // Create a new version if not found:
- if (!version) {
- // Do not use the canonical path here...
- version = QtVersionFactory::createQtVersionFromQMakePath(qmakeBinary);
- if (!version)
- continue;
-
- QtVersionManager::addVersion(version);
- temporaryVersion = true;
- }
-
- // find qmake arguments and mkspec
- QPair<BaseQtVersion::QmakeBuildConfigs, QString> makefileBuildConfig =
- QtVersionManager::scanMakeFile(makefile, version->defaultBuildConfig());
-
- QString additionalArguments = makefileBuildConfig.second;
- Utils::FileName parsedSpec =
- Qt4BuildConfiguration::extractSpecFromArguments(&additionalArguments, path.toString(), version);
- Utils::FileName versionSpec = version->mkspec();
- if (parsedSpec.isEmpty() || parsedSpec == Utils::FileName::fromString(QLatin1String("default")))
- parsedSpec = versionSpec;
-
- QString specArgument;
- // Compare mkspecs and add to additional arguments
- if (parsedSpec != versionSpec)
- specArgument = QLatin1String("-spec ") + Utils::QtcProcess::quoteArg(parsedSpec.toUserOutput());
- Utils::QtcProcess::addArgs(&specArgument, additionalArguments);
-
- // Find profiles (can be more than one, e.g. (Linux-)Desktop and embedded linux):
- QList<ProjectExplorer::Kit *> kitList;
- foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits()) {
- BaseQtVersion *profileVersion = QtKitInformation::qtVersion(k);
- Utils::FileName profileSpec = QmakeKitInformation::mkspec(k);
- ProjectExplorer::ToolChain *tc = ProjectExplorer::ToolChainKitInformation::toolChain(k);
- if (profileSpec.isEmpty() && profileVersion)
- profileSpec = profileVersion->mkspecFor(tc);
-
- if (profileVersion == version
- && profileSpec == parsedSpec)
- kitList.append(k);
- }
- if (kitList.isEmpty())
- kitList.append(createTemporaryKit(version, temporaryVersion, parsedSpec));
-
- foreach (ProjectExplorer::Kit *k, kitList) {
- addProject(k, m_proFilePath);
-
- // Create widget:
- Qt4TargetSetupWidget *widget = m_widgets.value(k->id(), 0);
- if (!widget)
- addWidget(k);
- widget = m_widgets.value(k->id(), 0);
- if (!widget)
- continue;
-
- // create info:
- BuildConfigurationInfo info = BuildConfigurationInfo(makefileBuildConfig.first,
- specArgument,
- path.toString(),
- true,
- file);
-
- widget->addBuildConfigurationInfo(info, true);
- widget->setKitSelected(true);
- found = true;
- }
- }
-
- updateVisibility();
-
- if (!found && !silent)
- QMessageBox::critical(this,
- tr("No Build Found"),
- tr("No build found in %1 matching project %2.").arg(path.toUserOutput()).arg(m_proFilePath));
-}
-
-void TargetSetupPage::handleQtUpdate(const QList<int> &add, const QList<int> &rm, const QList<int> &mod)
-{
- Q_UNUSED(add);
- // Update kit to no longer claim a Qt version is temporary once it is modified/removed.
- foreach (ProjectExplorer::Kit *k, ProjectExplorer::KitManager::kits()) {
- if (!k->hasValue(QT_IS_TEMPORARY))
- continue;
- int qtVersion = k->value(QT_IS_TEMPORARY, -1).toInt();
- if (rm.contains(qtVersion) || mod.contains(qtVersion))
- makeQtPersistent(k);
- }
-}
-
-void TargetSetupPage::setupImports()
-{
- if (!m_importSearch || m_proFilePath.isEmpty())
- return;
-
- QFileInfo pfi(m_proFilePath);
- const QString prefix = pfi.baseName();
- QStringList toImport;
- toImport << pfi.absolutePath();
-
- QList<ProjectExplorer::Kit *> kitList = ProjectExplorer::KitManager::kits();
- foreach (ProjectExplorer::Kit *k, kitList) {
- QFileInfo fi(Qt4Project::shadowBuildDirectory(m_proFilePath, k, QString()));
- const QString baseDir = fi.absolutePath();
-
- foreach (const QString &dir, QDir(baseDir).entryList()) {
- const QString path = baseDir + QLatin1Char('/') + dir;
- if (dir.startsWith(prefix) && !toImport.contains(path))
- toImport << path;
-
- }
- }
- foreach (const QString &path, toImport)
- import(Utils::FileName::fromString(path), true);
-}
-
-void TargetSetupPage::handleKitAddition(ProjectExplorer::Kit *k)
-{
- if (m_ignoreUpdates)
- return;
-
- Q_ASSERT(!m_widgets.contains(k->id()));
- addWidget(k);
- updateVisibility();
-}
-
-void TargetSetupPage::handleKitRemoval(ProjectExplorer::Kit *k)
-{
- BaseQtVersion *version = QtVersionManager::version(k->value(QT_IS_TEMPORARY, -1).toInt());
- if (version)
- QtVersionManager::removeVersion(version);
-
- if (m_ignoreUpdates)
- return;
-
- removeWidget(k);
- updateVisibility();
-}
-
-void TargetSetupPage::handleKitUpdate(ProjectExplorer::Kit *k)
-{
- if (m_ignoreUpdates)
- return;
-
- cleanKit(k);
- Qt4TargetSetupWidget *widget = m_widgets.value(k->id());
-
- bool acceptable = true;
- if (m_requiredMatcher && !m_requiredMatcher->matches(k))
- acceptable = false;
-
- if (widget && !acceptable)
- removeWidget(k);
- else if (!widget && acceptable)
- addWidget(k);
-
- updateVisibility();
-}
-
-void TargetSetupPage::selectAtLeastOneKit()
-{
- bool atLeastOneKitSelected = false;
- foreach (Qt4TargetSetupWidget *w, m_widgets.values()) {
- if (w->isKitSelected()) {
- atLeastOneKitSelected = true;
- break;
- }
- }
-
- if (!atLeastOneKitSelected) {
- Qt4TargetSetupWidget *widget = m_firstWidget;
- ProjectExplorer::Kit *defaultKit = ProjectExplorer::KitManager::defaultKit();
- if (defaultKit)
- widget = m_widgets.value(defaultKit->id(), m_firstWidget);
- if (widget)
- widget->setKitSelected(true);
- m_firstWidget = 0;
- }
- emit completeChanged(); // Is this necessary?
-}
-
-void TargetSetupPage::updateVisibility()
-{
- // Always show the widgets, the import widget always makes sense to show.
- m_ui->scrollAreaWidget->setVisible(m_baseLayout == m_ui->scrollArea->widget()->layout());
- m_ui->centralWidget->setVisible(m_baseLayout == m_ui->centralWidget->layout());
-
- bool hasKits = !m_widgets.isEmpty();
- m_ui->noValidKitLabel->setVisible(!hasKits);
- m_ui->optionHintLabel->setVisible(m_forceOptionHint || !hasKits);
-
- emit completeChanged();
-}
-
-void TargetSetupPage::openOptions()
-{
- Core::ICore::showOptionsDialog(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY,
- ProjectExplorer::Constants::KITS_SETTINGS_PAGE_ID,
- this);
-}
-
-void TargetSetupPage::removeWidget(ProjectExplorer::Kit *k)
-{
- Qt4TargetSetupWidget *widget = m_widgets.value(k->id());
- if (!widget)
- return;
- if (widget == m_firstWidget)
- m_firstWidget = 0;
- widget->deleteLater();
- m_widgets.remove(k->id());
-}
-
-Qt4TargetSetupWidget *TargetSetupPage::addWidget(ProjectExplorer::Kit *k)
-{
- if (m_requiredMatcher && !m_requiredMatcher->matches(k))
- return 0;
-
- QList<BuildConfigurationInfo> infoList = Qt4BuildConfigurationFactory::availableBuildConfigurations(k, m_proFilePath);
- Qt4TargetSetupWidget *widget = infoList.isEmpty() ? 0 : new Qt4TargetSetupWidget(k, m_proFilePath, infoList);
- if (!widget)
- return 0;
-
- m_baseLayout->removeWidget(m_importWidget);
- m_baseLayout->removeItem(m_spacer);
-
- widget->setKitSelected(m_preferredMatcher && m_preferredMatcher->matches(k));
- m_widgets.insert(k->id(), widget);
- m_baseLayout->addWidget(widget);
-
- m_baseLayout->addWidget(m_importWidget);
- m_baseLayout->addItem(m_spacer);
-
- connect(widget, SIGNAL(selectedToggled()),
- this, SIGNAL(completeChanged()));
-
- if (!m_firstWidget)
- m_firstWidget = widget;
-
- return widget;
-}
-
-class KitBuildInfo
-{
-public:
- KitBuildInfo(ProjectExplorer::Kit *k, const QList<BuildConfigurationInfo> &il) :
- kit(k), infoList(il)
- { }
-
- ProjectExplorer::Kit *kit;
- QList<BuildConfigurationInfo> infoList;
-};
-
-bool TargetSetupPage::setupProject(Qt4ProjectManager::Qt4Project *project)
-{
- QList<KitBuildInfo> toRegister;
- foreach (Qt4TargetSetupWidget *widget, m_widgets.values()) {
- if (!widget->isKitSelected())
- continue;
-
- ProjectExplorer::Kit *k = widget->kit();
- cleanKit(k);
- toRegister.append(KitBuildInfo(k, widget->selectedBuildConfigurationInfoList()));
- widget->clearKit();
- }
- reset();
-
- // only register kits after we are done cleaning up
- foreach (const KitBuildInfo &data, toRegister)
- project->addTarget(project->createTarget(data.kit, data.infoList));
-
- // Select active target
- // a) Simulator target
- // b) Desktop target
- // c) the first target
- ProjectExplorer::Target *activeTarget = 0;
- QList<ProjectExplorer::Target *> targets = project->targets();
- int activeTargetPriority = 0;
- foreach (ProjectExplorer::Target *t, targets) {
- BaseQtVersion *version = QtSupport::QtKitInformation::qtVersion(t->kit());
- if (t->kit() == ProjectExplorer::KitManager::defaultKit()) {
- activeTarget = t;
- activeTargetPriority = 3;
- } else if (activeTargetPriority < 2 && version && version->type() == QLatin1String(QtSupport::Constants::SIMULATORQT)) {
- activeTarget = t;
- activeTargetPriority = 2;
- } else if (activeTargetPriority < 1 && version && version->type() == QLatin1String(QtSupport::Constants::DESKTOPQT)) {
- activeTarget = t;
- activeTargetPriority = 1;
- }
- }
- if (!activeTarget && !targets.isEmpty())
- activeTarget = targets.first();
- if (activeTarget)
- project->setActiveTarget(activeTarget);
-
- return true;
-}
-
-void TargetSetupPage::setUseScrollArea(bool b)
-{
- m_baseLayout = b ? m_ui->scrollArea->widget()->layout() : m_ui->centralWidget->layout();
- m_ui->scrollAreaWidget->setVisible(b);
- m_ui->centralWidget->setVisible(!b);
-}
-
-} // namespace Qt4ProjectManager
--
GitLab