diff options
Diffstat (limited to 'src/plugins/projectexplorer/projectexplorer.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/projectexplorer.cpp | 180 |
1 files changed, 62 insertions, 118 deletions
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 6c98f71675..75c9ce59eb 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -27,7 +27,6 @@ #include "appoutputpane.h" #include "buildpropertiessettings.h" -#include "buildpropertiessettingspage.h" #include "buildsteplist.h" #include "buildsystem.h" #include "compileoutputwindow.h" @@ -124,7 +123,9 @@ #include <coreplugin/imode.h> #include <coreplugin/iversioncontrol.h> #include <coreplugin/locator/directoryfilter.h> +#include <coreplugin/minisplitter.h> #include <coreplugin/modemanager.h> +#include <coreplugin/outputpane.h> #include <coreplugin/vcsmanager.h> #include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginspec.h> @@ -256,10 +257,6 @@ const char RUNMENUCONTEXTMENU[] = "Project.RunMenu"; const char FOLDER_OPEN_LOCATIONS_CONTEXT_MENU[] = "Project.F.OpenLocation.CtxMenu"; const char PROJECT_OPEN_LOCATIONS_CONTEXT_MENU[] = "Project.P.OpenLocation.CtxMenu"; -// Default directories: -const char DEFAULT_BUILD_DIRECTORY_TEMPLATE[] = "../%{JS: Util.asciify(\"build-%{Project:Name}-%{Kit:FileSystemName}-%{BuildConfig:Name}\")}"; -const char DEFAULT_BUILD_DIRECTORY_TEMPLATE_KEY_OLD[] = "Directories/BuildDirectory.Template"; // TODO: Remove in ~4.16 -const char DEFAULT_BUILD_DIRECTORY_TEMPLATE_KEY[] = "Directories/BuildDirectory.TemplateV2"; const char RECENTPROJECTS_FILE_NAMES_KEY[] = "ProjectExplorer/RecentProjects/FileNames"; const char RECENTPROJECTS_DISPLAY_NAMES_KEY[] = "ProjectExplorer/RecentProjects/DisplayNames"; @@ -284,10 +281,6 @@ const char ABORT_BUILD_ALL_ON_ERROR_SETTINGS_KEY[] = "ProjectExplorer/Settings/AbortBuildAllOnError"; const char LOW_BUILD_PRIORITY_SETTINGS_KEY[] = "ProjectExplorer/Settings/LowBuildPriority"; -const char SEPARATE_DEBUG_INFO_SETTINGS_KEY[] = "ProjectExplorer/Settings/SeparateDebugInfo"; -const char QML_DEBUGGING_SETTINGS_KEY[] = "ProjectExplorer/Settings/QmlDebugging"; -const char QT_QUICK_COMPILER_SETTINGS_KEY[] = "ProjectExplorer/Settings/QtQuickCompiler"; - const char CUSTOM_PARSER_COUNT_KEY[] = "ProjectExplorer/Settings/CustomParserCount"; const char CUSTOM_PARSER_PREFIX_KEY[] = "ProjectExplorer/Settings/CustomParser"; @@ -505,19 +498,19 @@ public: QAction *m_buildSessionAction; QAction *m_buildSessionForAllConfigsAction; QAction *m_rebuildProjectOnlyAction; - Utils::ParameterAction *m_rebuildAction; - Utils::ParameterAction *m_rebuildProjectForAllConfigsAction; + QAction *m_rebuildAction; + QAction *m_rebuildProjectForAllConfigsAction; QAction *m_rebuildActionContextMenu; QAction *m_rebuildDependenciesActionContextMenu; QAction *m_rebuildSessionAction; QAction *m_rebuildSessionForAllConfigsAction; QAction *m_cleanProjectOnlyAction; QAction *m_deployProjectOnlyAction; - Utils::ParameterAction *m_deployAction; + QAction *m_deployAction; QAction *m_deployActionContextMenu; QAction *m_deploySessionAction; - Utils::ParameterAction *m_cleanAction; - Utils::ParameterAction *m_cleanProjectForAllConfigsAction; + QAction *m_cleanAction; + QAction *m_cleanProjectForAllConfigsAction; QAction *m_cleanActionContextMenu; QAction *m_cleanDependenciesActionContextMenu; QAction *m_cleanSessionAction; @@ -648,7 +641,7 @@ public: // Settings pages ProjectExplorerSettingsPage m_projectExplorerSettingsPage; - BuildPropertiesSettingsPage m_buildPropertiesSettingsPage; + BuildPropertiesSettingsPage m_buildPropertiesSettingsPage{&m_buildPropertiesSettings}; AppOutputSettingsPage m_appOutputSettingsPage; CompileOutputSettingsPage m_compileOutputSettingsPage; DeviceSettingsPage m_deviceSettingsPage; @@ -662,7 +655,8 @@ public: IDocumentFactory m_documentFactory; DeviceTypeKitAspect deviceTypeKitAspect; - DeviceKitAspect deviceeKitAspect; + DeviceKitAspect deviceKitAspect; + BuildDeviceKitAspect buildDeviceKitAspect; ToolChainKitAspect toolChainKitAspect; SysRootKitAspect sysRootKitAspect; EnvironmentKitAspect environmentKitAspect; @@ -804,7 +798,10 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er Context projectTreeContext(Constants::C_PROJECT_TREE); - dd->m_projectsMode.setWidget(dd->m_proWindow); + auto splitter = new MiniSplitter(Qt::Vertical); + splitter->addWidget(dd->m_proWindow); + splitter->addWidget(new OutputPanePlaceHolder(Constants::MODE_SESSION, splitter)); + dd->m_projectsMode.setWidget(splitter); dd->m_projectsMode.setEnabled(false); ICore::addPreCloseListener([]() -> bool { return coreAboutToClose(); }); @@ -894,9 +891,13 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er // mbuild->appendGroup(Constants::G_BUILD_BUILD); - mbuild->appendGroup(Constants::G_BUILD_DEPLOY); - mbuild->appendGroup(Constants::G_BUILD_REBUILD); - mbuild->appendGroup(Constants::G_BUILD_CLEAN); + mbuild->appendGroup(Constants::G_BUILD_ALLPROJECTS); + mbuild->appendGroup(Constants::G_BUILD_PROJECT); + mbuild->appendGroup(Constants::G_BUILD_PRODUCT); + mbuild->appendGroup(Constants::G_BUILD_SUBPROJECT); + mbuild->appendGroup(Constants::G_BUILD_FILE); + mbuild->appendGroup(Constants::G_BUILD_ALLPROJECTS_ALLCONFIGURATIONS); + mbuild->appendGroup(Constants::G_BUILD_PROJECT_ALLCONFIGURATIONS); mbuild->appendGroup(Constants::G_BUILD_CANCEL); mbuild->appendGroup(Constants::G_BUILD_RUN); @@ -982,7 +983,14 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er mprojectContextMenu->addSeparator(projectTreeContext, Constants::G_PROJECT_FILES); msubProjectContextMenu->addSeparator(projectTreeContext, Constants::G_PROJECT_FILES); mfile->addSeparator(Core::Constants::G_FILE_PROJECT); - mbuild->addSeparator(Constants::G_BUILD_REBUILD); + mbuild->addSeparator(Constants::G_BUILD_BUILD); + mbuild->addSeparator(Constants::G_BUILD_ALLPROJECTS); + mbuild->addSeparator(Constants::G_BUILD_PROJECT); + mbuild->addSeparator(Constants::G_BUILD_PRODUCT); + mbuild->addSeparator(Constants::G_BUILD_SUBPROJECT); + mbuild->addSeparator(Constants::G_BUILD_FILE); + mbuild->addSeparator(Constants::G_BUILD_ALLPROJECTS_ALLCONFIGURATIONS); + mbuild->addSeparator(Constants::G_BUILD_PROJECT_ALLCONFIGURATIONS); msessionContextMenu->addSeparator(Constants::G_SESSION_OTHER); mbuild->addSeparator(Constants::G_BUILD_CANCEL); mbuild->addSeparator(Constants::G_BUILD_RUN); @@ -1119,49 +1127,49 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er dd->m_buildSessionAction = new QAction(buildIcon, tr("Build All Projects"), this); cmd = ActionManager::registerAction(dd->m_buildSessionAction, Constants::BUILDSESSION); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Shift+B"))); - mbuild->addAction(cmd, Constants::G_BUILD_BUILD); + mbuild->addAction(cmd, Constants::G_BUILD_ALLPROJECTS); msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD); dd->m_buildSessionForAllConfigsAction = new QAction(buildIcon, tr("Build All Projects for All Configurations"), this); cmd = ActionManager::registerAction(dd->m_buildSessionForAllConfigsAction, Constants::BUILDSESSIONALLCONFIGS); - mbuild->addAction(cmd, Constants::G_BUILD_BUILD); + mbuild->addAction(cmd, Constants::G_BUILD_ALLPROJECTS_ALLCONFIGURATIONS); msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD); // deploy session - dd->m_deploySessionAction = new QAction(tr("Deploy All Projects"), this); + dd->m_deploySessionAction = new QAction(tr("Deploy"), this); cmd = ActionManager::registerAction(dd->m_deploySessionAction, Constants::DEPLOYSESSION); - mbuild->addAction(cmd, Constants::G_BUILD_DEPLOY); + mbuild->addAction(cmd, Constants::G_BUILD_ALLPROJECTS); msessionContextMenu->addAction(cmd, Constants::G_SESSION_BUILD); // rebuild session action - dd->m_rebuildSessionAction = new QAction(Icons::REBUILD.icon(), tr("Rebuild All Projects"), + dd->m_rebuildSessionAction = new QAction(Icons::REBUILD.icon(), tr("Rebuild"), this); cmd = ActionManager::registerAction(dd->m_rebuildSessionAction, Constants::REBUILDSESSION); - mbuild->addAction(cmd, Constants::G_BUILD_REBUILD); + mbuild->addAction(cmd, Constants::G_BUILD_ALLPROJECTS); msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); dd->m_rebuildSessionForAllConfigsAction - = new QAction(Icons::REBUILD.icon(), tr("Rebuild All Projects for All Configurations"), + = new QAction(Icons::REBUILD.icon(), tr("Rebuild"), this); cmd = ActionManager::registerAction(dd->m_rebuildSessionForAllConfigsAction, Constants::REBUILDSESSIONALLCONFIGS); - mbuild->addAction(cmd, Constants::G_BUILD_REBUILD); + mbuild->addAction(cmd, Constants::G_BUILD_ALLPROJECTS_ALLCONFIGURATIONS); msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); // clean session - dd->m_cleanSessionAction = new QAction(Utils::Icons::CLEAN.icon(), tr("Clean All Projects"), + dd->m_cleanSessionAction = new QAction(Utils::Icons::CLEAN.icon(), tr("Clean"), this); cmd = ActionManager::registerAction(dd->m_cleanSessionAction, Constants::CLEANSESSION); - mbuild->addAction(cmd, Constants::G_BUILD_CLEAN); + mbuild->addAction(cmd, Constants::G_BUILD_ALLPROJECTS); msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); dd->m_cleanSessionForAllConfigsAction = new QAction(Utils::Icons::CLEAN.icon(), - tr("Clean All Projects for All Configurations"), this); + tr("Clean"), this); cmd = ActionManager::registerAction(dd->m_cleanSessionForAllConfigsAction, Constants::CLEANSESSIONALLCONFIGS); - mbuild->addAction(cmd, Constants::G_BUILD_CLEAN); + mbuild->addAction(cmd, Constants::G_BUILD_ALLPROJECTS_ALLCONFIGURATIONS); msessionContextMenu->addAction(cmd, Constants::G_SESSION_REBUILD); // build action @@ -1172,7 +1180,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er cmd->setAttribute(Command::CA_UpdateText); cmd->setDescription(dd->m_buildAction->text()); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+B"))); - mbuild->addAction(cmd, Constants::G_BUILD_BUILD); + mbuild->addAction(cmd, Constants::G_BUILD_PROJECT); dd->m_buildProjectForAllConfigsAction = new Utils::ParameterAction(tr("Build Project for All Configurations"), @@ -1183,7 +1191,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er Constants::BUILDALLCONFIGS); cmd->setAttribute(Command::CA_UpdateText); cmd->setDescription(dd->m_buildProjectForAllConfigsAction->text()); - mbuild->addAction(cmd, Constants::G_BUILD_BUILD); + mbuild->addAction(cmd, Constants::G_BUILD_PROJECT_ALLCONFIGURATIONS); // Add to mode bar dd->m_modeBarBuildAction = new Utils::ProxyAction(this); @@ -1205,48 +1213,41 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er mbuild->addAction(cmd, Constants::G_BUILD_BUILD); // deploy action - dd->m_deployAction = new Utils::ParameterAction(tr("Deploy Project"), tr("Deploy Project \"%1\""), - Utils::ParameterAction::AlwaysEnabled, this); + dd->m_deployAction = new QAction(tr("Deploy"), this); cmd = ActionManager::registerAction(dd->m_deployAction, Constants::DEPLOY); cmd->setAttribute(Command::CA_UpdateText); cmd->setDescription(dd->m_deployAction->text()); - mbuild->addAction(cmd, Constants::G_BUILD_DEPLOY); + mbuild->addAction(cmd, Constants::G_BUILD_PROJECT); // rebuild action - dd->m_rebuildAction = new Utils::ParameterAction(tr("Rebuild Project"), tr("Rebuild Project \"%1\""), - Utils::ParameterAction::AlwaysEnabled, this); + dd->m_rebuildAction = new QAction(Icons::REBUILD.icon(), tr("Rebuild"), this); cmd = ActionManager::registerAction(dd->m_rebuildAction, Constants::REBUILD); cmd->setAttribute(Command::CA_UpdateText); cmd->setDescription(dd->m_rebuildAction->text()); - mbuild->addAction(cmd, Constants::G_BUILD_REBUILD); + mbuild->addAction(cmd, Constants::G_BUILD_PROJECT); dd->m_rebuildProjectForAllConfigsAction - = new Utils::ParameterAction(tr("Rebuild Project for All Configurations"), - tr("Rebuild Project \"%1\" for All Configurations"), - Utils::ParameterAction::AlwaysEnabled, this); + = new QAction(Icons::REBUILD.icon(), tr("Rebuild"), this); cmd = ActionManager::registerAction(dd->m_rebuildProjectForAllConfigsAction, Constants::REBUILDALLCONFIGS); cmd->setAttribute(Command::CA_UpdateText); cmd->setDescription(dd->m_rebuildProjectForAllConfigsAction->text()); - mbuild->addAction(cmd, Constants::G_BUILD_REBUILD); + mbuild->addAction(cmd, Constants::G_BUILD_PROJECT_ALLCONFIGURATIONS); // clean action - dd->m_cleanAction = new Utils::ParameterAction(tr("Clean Project"), tr("Clean Project \"%1\""), - Utils::ParameterAction::AlwaysEnabled, this); + dd->m_cleanAction = new QAction(Utils::Icons::CLEAN.icon(), tr("Clean"), this); cmd = ActionManager::registerAction(dd->m_cleanAction, Constants::CLEAN); cmd->setAttribute(Command::CA_UpdateText); cmd->setDescription(dd->m_cleanAction->text()); - mbuild->addAction(cmd, Constants::G_BUILD_CLEAN); + mbuild->addAction(cmd, Constants::G_BUILD_PROJECT); dd->m_cleanProjectForAllConfigsAction - = new Utils::ParameterAction(tr("Clean Project for All Configurations"), - tr("Clean Project \"%1\" for All Configurations"), - Utils::ParameterAction::AlwaysEnabled, this); + = new QAction(Utils::Icons::CLEAN.icon(), tr("Clean"), this); cmd = ActionManager::registerAction(dd->m_cleanProjectForAllConfigsAction, Constants::CLEANALLCONFIGS); cmd->setAttribute(Command::CA_UpdateText); cmd->setDescription(dd->m_cleanProjectForAllConfigsAction->text()); - mbuild->addAction(cmd, Constants::G_BUILD_CLEAN); + mbuild->addAction(cmd, Constants::G_BUILD_PROJECT_ALLCONFIGURATIONS); // cancel build action dd->m_cancelBuildAction = new QAction(Utils::Icons::STOP_SMALL.icon(), tr("Cancel Build"), this); @@ -1585,33 +1586,7 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er = s->value(Constants::LOW_BUILD_PRIORITY_SETTINGS_KEY, defaultSettings.lowBuildPriority) .toBool(); - dd->m_buildPropertiesSettings.buildDirectoryTemplateOld - = s->value(Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE_KEY_OLD).toString(); - dd->m_buildPropertiesSettings.buildDirectoryTemplate - = s->value(Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE_KEY).toString(); - if (dd->m_buildPropertiesSettings.buildDirectoryTemplate.isEmpty()) { - dd->m_buildPropertiesSettings.buildDirectoryTemplate - = dd->m_buildPropertiesSettings.buildDirectoryTemplateOld; - } - if (dd->m_buildPropertiesSettings.buildDirectoryTemplate.isEmpty()) - dd->m_buildPropertiesSettings.buildDirectoryTemplate = Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE; - // TODO: Remove in ~4.16 - dd->m_buildPropertiesSettings.buildDirectoryTemplate.replace("%{CurrentProject:Name}", - "%{Project:Name}"); - dd->m_buildPropertiesSettings.buildDirectoryTemplate.replace("%{CurrentKit:FileSystemName}", - "%{Kit:FileSystemName}"); - dd->m_buildPropertiesSettings.buildDirectoryTemplate.replace("%{CurrentBuild:Name}", - "%{BuildConfig:Name}"); - - const auto loadTriStateValue = [&s](const QString &key) { - return TriState::fromVariant(s->value(key, TriState::Default.toVariant())); - }; - dd->m_buildPropertiesSettings.separateDebugInfo - = loadTriStateValue(Constants::SEPARATE_DEBUG_INFO_SETTINGS_KEY); - dd->m_buildPropertiesSettings.qmlDebugging - = loadTriStateValue(Constants::QML_DEBUGGING_SETTINGS_KEY); - dd->m_buildPropertiesSettings.qtQuickCompiler - = loadTriStateValue(Constants::QT_QUICK_COMPILER_SETTINGS_KEY); + dd->m_buildPropertiesSettings.readSettings(s); const int customParserCount = s->value(Constants::CUSTOM_PARSER_COUNT_KEY).toInt(); for (int i = 0; i < customParserCount; ++i) { @@ -2096,8 +2071,7 @@ void ProjectExplorerPlugin::extensionsInitialized() QSsh::SshSettings::loadSettings(Core::ICore::settings()); const auto searchPathRetriever = [] { - Utils::FilePaths searchPaths; - searchPaths << Utils::FilePath::fromString(Core::ICore::libexecPath()); + Utils::FilePaths searchPaths = {Core::ICore::libexecPath()}; if (Utils::HostOsInfo::isWindowsHost()) { const QString gitBinary = Core::ICore::settings()->value("Git/BinaryPath", "git") .toString(); @@ -2301,27 +2275,7 @@ void ProjectExplorerPluginPrivate::savePersistentSettings() int(dd->m_projectExplorerSettings.stopBeforeBuild), int(defaultSettings.stopBeforeBuild)); - // Store this in the Core directory scope for backward compatibility! - if (dd->m_buildPropertiesSettings.buildDirectoryTemplate - == Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE) { - s->remove(Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE_KEY_OLD); - s->remove(Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE_KEY); - } else { - s->setValue(Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE_KEY_OLD, - dd->m_buildPropertiesSettings.buildDirectoryTemplateOld); - s->setValue(Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE_KEY, - dd->m_buildPropertiesSettings.buildDirectoryTemplate); - } - - s->setValueWithDefault(Constants::SEPARATE_DEBUG_INFO_SETTINGS_KEY, - dd->m_buildPropertiesSettings.separateDebugInfo.toVariant(), - TriState::Default.toVariant()); - s->setValueWithDefault(Constants::QML_DEBUGGING_SETTINGS_KEY, - dd->m_buildPropertiesSettings.qmlDebugging.toVariant(), - TriState::Default.toVariant()); - s->setValueWithDefault(Constants::QT_QUICK_COMPILER_SETTINGS_KEY, - dd->m_buildPropertiesSettings.qtQuickCompiler.toVariant(), - TriState::Default.toVariant()); + dd->m_buildPropertiesSettings.writeSettings(s); s->setValueWithDefault(Constants::CUSTOM_PARSER_COUNT_KEY, int(dd->m_customParsers.count()), 0); for (int i = 0; i < dd->m_customParsers.count(); ++i) { @@ -2730,10 +2684,6 @@ void ProjectExplorerPluginPrivate::updateActions() m_buildProjectForAllConfigsAction->setParameter(projectName); if (runConfig) m_buildForRunConfigAction->setParameter(runConfig->displayName()); - m_rebuildAction->setParameter(projectName); - m_rebuildProjectForAllConfigsAction->setParameter(projectName); - m_cleanAction->setParameter(projectName); - m_cleanProjectForAllConfigsAction->setParameter(projectName); m_buildAction->setEnabled(buildActionState.first); m_buildProjectForAllConfigsAction->setEnabled(buildActionState.first); @@ -3104,7 +3054,6 @@ void ProjectExplorerPluginPrivate::updateDeployActions() const QString projectName = project ? project->displayName() : QString(); bool hasProjects = SessionManager::hasProjects(); - m_deployAction->setParameter(projectName); m_deployAction->setEnabled(enableDeployActions); m_deployActionContextMenu->setEnabled(enableDeployActionsContextMenu); @@ -3510,7 +3459,7 @@ void ProjectExplorerPluginPrivate::updateLocationSubMenus() : tr("%1 in %2").arg(li.displayName).arg(li.path.toUserOutput()); auto *action = new QAction(displayName, nullptr); connect(action, &QAction::triggered, this, [line, path]() { - Core::EditorManager::openEditorAt(path.toString(), line); + Core::EditorManager::openEditorAt(Link(path, line)); }); projectMenu->addAction(action); @@ -3690,7 +3639,7 @@ void ProjectExplorerPluginPrivate::openFile() { const Node *currentNode = ProjectTree::currentNode(); QTC_ASSERT(currentNode, return); - EditorManager::openEditor(currentNode->filePath().toString()); + EditorManager::openEditor(currentNode->filePath()); } void ProjectExplorerPluginPrivate::searchOnFileSystem() @@ -4022,19 +3971,14 @@ const AppOutputSettings &ProjectExplorerPlugin::appOutputSettings() return dd->m_outputPane.settings(); } -void ProjectExplorerPlugin::setBuildPropertiesSettings(const BuildPropertiesSettings &settings) -{ - dd->m_buildPropertiesSettings = settings; -} - -const BuildPropertiesSettings &ProjectExplorerPlugin::buildPropertiesSettings() +BuildPropertiesSettings &ProjectExplorerPlugin::buildPropertiesSettings() { return dd->m_buildPropertiesSettings; } void ProjectExplorerPlugin::showQtSettings() { - dd->m_buildPropertiesSettings.showQtSettings = true; + dd->m_buildPropertiesSettings.showQtSettings.setValue(true); } void ProjectExplorerPlugin::setCustomParsers(const QList<CustomParserSettings> &settings) @@ -4107,12 +4051,12 @@ void ProjectExplorerPlugin::openOpenProjectDialog() */ QString ProjectExplorerPlugin::buildDirectoryTemplate() { - return dd->m_buildPropertiesSettings.buildDirectoryTemplate; + return dd->m_buildPropertiesSettings.buildDirectoryTemplate.value(); } QString ProjectExplorerPlugin::defaultBuildDirectoryTemplate() { - return QString(Constants::DEFAULT_BUILD_DIRECTORY_TEMPLATE); + return dd->m_buildPropertiesSettings.defaultBuildDirectoryTemplate(); } void ProjectExplorerPlugin::updateActions() |