diff --git a/src/plugins/qbsprojectmanager/qbsinfopage.cpp b/src/plugins/qbsprojectmanager/qbsinfopage.cpp deleted file mode 100644 index 794d984a613..00000000000 --- a/src/plugins/qbsprojectmanager/qbsinfopage.cpp +++ /dev/null @@ -1,76 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "qbsinfopage.h" -#include "ui_qbsinfowidget.h" - -#include "qbsprojectmanagerconstants.h" - -#include - -namespace QbsProjectManager { -namespace Internal { - -class QbsInfoWidget : public QWidget -{ - Q_OBJECT -public: - QbsInfoWidget(QWidget *parent = 0) : QWidget(parent) - { - m_ui.setupUi(this); - m_ui.versionValueLabel->setText(qbs::LanguageInfo::qbsVersion()); - } - - Ui::QbsInfoWidget m_ui; -}; - - -QbsInfoPage::QbsInfoPage(QObject *parent) : Core::IOptionsPage(parent), m_widget(nullptr) -{ - setId("AB.QbsInfo"); - setDisplayName(QCoreApplication::translate("QbsProjectManager", "Version Info")); - setCategory(Constants::QBS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("QbsProjectManager", - Constants::QBS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::QBS_SETTINGS_CATEGORY_ICON)); -} - -QWidget *QbsInfoPage::widget() -{ - if (!m_widget) - m_widget = new QbsInfoWidget; - return m_widget; -} - -void QbsInfoPage::finish() -{ - delete m_widget; - m_widget = nullptr; -} - -} // namespace Internal -} // namespace QbsProjectManager - -#include "qbsinfopage.moc" diff --git a/src/plugins/qbsprojectmanager/qbsinfopage.h b/src/plugins/qbsprojectmanager/qbsinfopage.h deleted file mode 100644 index f7cfa882d62..00000000000 --- a/src/plugins/qbsprojectmanager/qbsinfopage.h +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include - -namespace QbsProjectManager { -namespace Internal { -class QbsInfoWidget; - -class QbsInfoPage : public Core::IOptionsPage -{ -public: - QbsInfoPage(QObject *parent = nullptr); - -private: - QWidget *widget() override; - void apply() override { }; - void finish() override; - - QbsInfoWidget *m_widget; -}; - -} // namespace Internal -} // namespace QbsProjectManager diff --git a/src/plugins/qbsprojectmanager/qbsinfowidget.ui b/src/plugins/qbsprojectmanager/qbsinfowidget.ui deleted file mode 100644 index 5f7bffd73b8..00000000000 --- a/src/plugins/qbsprojectmanager/qbsinfowidget.ui +++ /dev/null @@ -1,35 +0,0 @@ - - - QbsProjectManager::Internal::QbsInfoWidget - - - - 0 - 0 - 229 - 40 - - - - Form - - - - - - Qbs version: - - - - - - - - - - - - - - - diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index 49de784313e..8e54900fd64 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -67,12 +68,12 @@ QbsProfilesSettingsPage::QbsProfilesSettingsPage(QObject *parent) , m_useQtcSettingsDirPersistent(QbsProjectManagerSettings::useCreatorSettingsDirForQbs()) { - setId("AA.QbsProfiles"); - setDisplayName(QCoreApplication::translate("QbsProjectManager", "Profiles")); - setCategory(Constants::QBS_SETTINGS_CATEGORY); - setDisplayCategory(QCoreApplication::translate("QbsProjectManager", - Constants::QBS_SETTINGS_TR_CATEGORY)); - setCategoryIcon(Utils::Icon(Constants::QBS_SETTINGS_CATEGORY_ICON)); + setId("Y.QbsProfiles"); + setDisplayName(QCoreApplication::translate("QbsProjectManager", "Qbs")); + setCategory(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY); + setDisplayCategory(QCoreApplication::translate("ProjectExplorer", + ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_TR_CATEGORY)); + setCategoryIcon(Utils::Icon(ProjectExplorer::Constants::PROJECTEXPLORER_SETTINGS_CATEGORY_ICON)); } QWidget *QbsProfilesSettingsPage::widget() @@ -105,6 +106,7 @@ QbsProfilesSettingsWidget::QbsProfilesSettingsWidget(QWidget *parent) m_model.setEditable(false); m_ui.setupUi(this); m_ui.settingsDirCheckBox->setChecked(QbsProjectManagerSettings::useCreatorSettingsDirForQbs()); + m_ui.versionValueLabel->setText(qbs::LanguageInfo::qbsVersion()); connect(ProjectExplorer::KitManager::instance(), &ProjectExplorer::KitManager::kitsChanged, this, &QbsProfilesSettingsWidget::refreshKitsList); connect(m_ui.settingsDirCheckBox, &QCheckBox::stateChanged, [this]() { diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingswidget.ui b/src/plugins/qbsprojectmanager/qbsprofilessettingswidget.ui index 69086d71289..ce3f9ed8080 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingswidget.ui +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingswidget.ui @@ -23,14 +23,14 @@ - + Kit: - + @@ -50,20 +50,34 @@ - + Associated profile: - + + + + + Qbs version: + + + + + + + TextLabel + + + diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro index bbe36df9b3c..efd74e5db42 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro @@ -27,7 +27,6 @@ HEADERS = \ qbsbuildstep.h \ qbscleanstep.h \ qbsdeployconfigurationfactory.h \ - qbsinfopage.h \ qbskitinformation.h \ qbsinstallstep.h \ qbslogsink.h \ @@ -55,7 +54,6 @@ SOURCES = \ qbsbuildstep.cpp \ qbscleanstep.cpp \ qbsdeployconfigurationfactory.cpp \ - qbsinfopage.cpp \ qbsinstallstep.cpp \ qbskitinformation.cpp \ qbslogsink.cpp \ @@ -76,7 +74,6 @@ FORMS = \ customqbspropertiesdialog.ui \ qbsbuildstepconfigwidget.ui \ qbscleanstepconfigwidget.ui \ - qbsinfowidget.ui \ qbsinstallstepconfigwidget.ui \ qbsprofilessettingswidget.ui diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs index 0812c8ca659..fe7108e8c36 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs +++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.qbs @@ -78,9 +78,6 @@ QtcPlugin { "qbscleanstepconfigwidget.ui", "qbsdeployconfigurationfactory.cpp", "qbsdeployconfigurationfactory.h", - "qbsinfopage.cpp", - "qbsinfopage.h", - "qbsinfowidget.ui", "qbsinstallstep.cpp", "qbsinstallstep.h", "qbsinstallstepconfigwidget.ui", diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index 8ad70ee87b5..a15c2ca2cc7 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -29,7 +29,6 @@ #include "qbsbuildstep.h" #include "qbscleanstep.h" #include "qbsdeployconfigurationfactory.h" -#include "qbsinfopage.h" #include "qbsinstallstep.h" #include "qbskitinformation.h" #include "qbsnodes.h" @@ -105,7 +104,6 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString * addAutoReleasedObject(new QbsDeployConfigurationFactory); addAutoReleasedObject(new QbsRunConfigurationFactory); addAutoReleasedObject(new QbsProfilesSettingsPage); - addAutoReleasedObject(new QbsInfoPage); //menus // Build Menu: