diff options
-rw-r--r-- | src/plugins/projectexplorer/project.cpp | 4 | ||||
-rw-r--r-- | src/plugins/projectexplorer/project.h | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/projectwindow.cpp | 2 | ||||
-rw-r--r-- | src/plugins/projectexplorer/unconfiguredprojectpanel.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeproject.cpp | 4 | ||||
-rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeproject.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 728b6f050c..f3b1684597 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -476,9 +476,9 @@ void Project::configureAsExampleProject(const QStringList &platforms) Q_UNUSED(platforms); } -bool Project::supportsNoTargetPanel() const +bool Project::requiresTargetPanel() const { - return false; + return true; } bool Project::needsSpecialDeployment() const diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index 6f8f896335..252677a472 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -128,7 +128,7 @@ public: virtual bool needsConfiguration() const; virtual void configureAsExampleProject(const QStringList &platforms); - virtual bool supportsNoTargetPanel() const; + virtual bool requiresTargetPanel() const; virtual ProjectImporter *createProjectImporter() const; virtual KitMatcher *createRequiredKitMatcher() const { return 0; } virtual KitMatcher *createPreferredKitMatcher() const { return 0; } diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index 7cf088cae3..203dff7d91 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -392,7 +392,7 @@ void ProjectWindow::showProperties(int index, int subIndex) m_previousTargetSubIndex = previousPanelWidget->currentSubIndex(); } - if (m_hasTarget.value(project) || !project->supportsNoTargetPanel()) { + if (m_hasTarget.value(project) || project->requiresTargetPanel()) { if (subIndex == 0) { // Targets page removeCurrentWidget(); diff --git a/src/plugins/projectexplorer/unconfiguredprojectpanel.cpp b/src/plugins/projectexplorer/unconfiguredprojectpanel.cpp index 345110e427..5651fee9aa 100644 --- a/src/plugins/projectexplorer/unconfiguredprojectpanel.cpp +++ b/src/plugins/projectexplorer/unconfiguredprojectpanel.cpp @@ -69,7 +69,7 @@ int UnconfiguredProjectPanel::priority() const bool UnconfiguredProjectPanel::supports(Project *project) { - return project->targets().isEmpty() && project->supportsNoTargetPanel(); + return project->targets().isEmpty() && !project->requiresTargetPanel(); } PropertiesPanel *UnconfiguredProjectPanel::createPanel(Project *project) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index cc89d31e85..bc156a46d8 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -1398,9 +1398,9 @@ void QmakeProject::configureAsExampleProject(const QStringList &platforms) ProjectExplorerPlugin::instance()->requestProjectModeUpdate(this); } -bool QmakeProject::supportsNoTargetPanel() const +bool QmakeProject::requiresTargetPanel() const { - return true; + return false; } // All the Qmake run configurations should share code. diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.h b/src/plugins/qmakeprojectmanager/qmakeproject.h index 0c19acb408..d5e8d717b7 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.h +++ b/src/plugins/qmakeprojectmanager/qmakeproject.h @@ -124,7 +124,7 @@ public: void configureAsExampleProject(const QStringList &platforms); - bool supportsNoTargetPanel() const; + bool requiresTargetPanel() const; /// \internal QString disabledReasonForRunConfiguration(const QString &proFilePath); |