diff --git a/src/libs/utils/environmentdialog.cpp b/src/libs/utils/environmentdialog.cpp new file mode 100644 index 00000000000..c0a50b75423 --- /dev/null +++ b/src/libs/utils/environmentdialog.cpp @@ -0,0 +1,170 @@ +/**************************************************************************** +** +** 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 "environmentdialog.h" + +#include +#include + +#include +#include +#include +#include + +namespace Utils { + +namespace Internal { + +static QList cleanUp( + const QList &items) +{ + QList uniqueItems; + QSet uniqueSet; + for (int i = items.count() - 1; i >= 0; i--) { + EnvironmentItem item = items.at(i); + if (HostOsInfo::isWindowsHost()) + item.name = item.name.toUpper(); + const QString &itemName = item.name; + QString emptyName = itemName; + emptyName.remove(QLatin1Char(' ')); + if (!emptyName.isEmpty() && !uniqueSet.contains(itemName)) { + uniqueItems.prepend(item); + uniqueSet.insert(itemName); + } + } + return uniqueItems; +} + +class EnvironmentItemsWidget : public QWidget +{ + Q_OBJECT +public: + explicit EnvironmentItemsWidget(QWidget *parent = nullptr); + + void setEnvironmentItems(const QList &items); + QList environmentItems() const; + + void setPlaceholderText(const QString &text); + +private: + QPlainTextEdit *m_editor; +}; + +EnvironmentItemsWidget::EnvironmentItemsWidget(QWidget *parent) : + QWidget(parent) +{ + m_editor = new QPlainTextEdit(this); + auto layout = new QVBoxLayout(this); + layout->addWidget(m_editor); +} + +void EnvironmentItemsWidget::setEnvironmentItems(const QList &items) +{ + QList sortedItems = items; + EnvironmentItem::sort(&sortedItems); + const QStringList list = EnvironmentItem::toStringList(sortedItems); + m_editor->document()->setPlainText(list.join(QLatin1Char('\n'))); +} + +QList EnvironmentItemsWidget::environmentItems() const +{ + const QStringList list = m_editor->document()->toPlainText().split(QLatin1String("\n")); + QList items = EnvironmentItem::fromStringList(list); + return cleanUp(items); +} + +void EnvironmentItemsWidget::setPlaceholderText(const QString &text) +{ + m_editor->setPlaceholderText(text); +} + +class EnvironmentDialogPrivate +{ +public: + EnvironmentItemsWidget *m_editor; +}; + +} // namespace Internal + +EnvironmentDialog::EnvironmentDialog(QWidget *parent) : + QDialog(parent), d(new Internal::EnvironmentDialogPrivate) +{ + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + resize(640, 480); + d->m_editor = new Internal::EnvironmentItemsWidget(this); + d->m_editor->setToolTip(tr("Enter one variable per line with the variable name " + "separated from the variable value by \"=\".
" + "Environment variables can be referenced with ${OTHER}.")); + auto box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this); + connect(box, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(box, &QDialogButtonBox::rejected, this, &QDialog::reject); + auto layout = new QVBoxLayout(this); + QLabel *label = new QLabel(this); + label->setText(tr("Change environment by assigning one environment variable per line:")); + layout->addWidget(label); + layout->addWidget(d->m_editor); + layout->addWidget(box); + setWindowTitle(tr("Edit Environment")); +} + +EnvironmentDialog::~EnvironmentDialog() +{ + delete d; +} + +void EnvironmentDialog::setEnvironmentItems(const QList &items) +{ + d->m_editor->setEnvironmentItems(items); +} + +QList EnvironmentDialog::environmentItems() const +{ + return d->m_editor->environmentItems(); +} + +void EnvironmentDialog::setPlaceholderText(const QString &text) +{ + d->m_editor->setPlaceholderText(text); +} + +QList EnvironmentDialog::getEnvironmentItems(bool *ok, + QWidget *parent, + const QList &initial, + const QString &placeholderText) +{ + EnvironmentDialog dlg(parent); + dlg.setEnvironmentItems(initial); + dlg.setPlaceholderText(placeholderText); + bool result = dlg.exec() == QDialog::Accepted; + if (ok) + *ok = result; + if (result) + return dlg.environmentItems(); + return QList(); +} + +} // namespace Utils + +#include "environmentdialog.moc" diff --git a/src/plugins/projectexplorer/environmentitemswidget.h b/src/libs/utils/environmentdialog.h similarity index 55% rename from src/plugins/projectexplorer/environmentitemswidget.h rename to src/libs/utils/environmentdialog.h index 8a81281862b..4780b250ff3 100644 --- a/src/plugins/projectexplorer/environmentitemswidget.h +++ b/src/libs/utils/environmentdialog.h @@ -25,46 +25,34 @@ #pragma once +#include "utils_global.h" +#include "environment.h" + #include -namespace Utils { class EnvironmentItem; } +namespace Utils { -namespace ProjectExplorer { -class EnvironmentItemsWidgetPrivate; +namespace Internal { class EnvironmentDialogPrivate; } -class EnvironmentItemsWidget : public QWidget +class QTCREATOR_UTILS_EXPORT EnvironmentDialog : public QDialog { Q_OBJECT public: - explicit EnvironmentItemsWidget(QWidget *parent = nullptr); - ~EnvironmentItemsWidget() override; + explicit EnvironmentDialog(QWidget *parent = nullptr); + ~EnvironmentDialog() override; - void setEnvironmentItems(const QList &items); - QList environmentItems() const; + void setEnvironmentItems(const QList &items); + QList environmentItems() const; + + void setPlaceholderText(const QString &text); + + static QList getEnvironmentItems(bool *ok, + QWidget *parent = nullptr, + const QList &initial = QList(), + const QString &placeholderText = QString()); private: - EnvironmentItemsWidgetPrivate *d; + Internal::EnvironmentDialogPrivate *d; }; - -class EnvironmentItemsDialogPrivate; - -class EnvironmentItemsDialog : public QDialog -{ - Q_OBJECT -public: - explicit EnvironmentItemsDialog(QWidget *parent = nullptr); - ~EnvironmentItemsDialog() override; - - void setEnvironmentItems(const QList &items); - QList environmentItems() const; - - static QList - getEnvironmentItems(QWidget *parent, const QList &initial, - bool *ok = nullptr); - -private: - EnvironmentItemsDialogPrivate *d; -}; - -} // namespace ProjectExplorer +} // namespace Utils diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri index a8b79e5e262..9139016cc34 100644 --- a/src/libs/utils/utils-lib.pri +++ b/src/libs/utils/utils-lib.pri @@ -14,6 +14,7 @@ win32: LIBS += -liphlpapi -lws2_32 SOURCES += $$PWD/environment.cpp \ $$PWD/environmentmodel.cpp \ + $$PWD/environmentdialog.cpp \ $$PWD/qtcprocess.cpp \ $$PWD/reloadpromptutils.cpp \ $$PWD/shellcommand.cpp \ @@ -107,6 +108,7 @@ else:SOURCES += $$PWD/consoleprocess_unix.cpp HEADERS += \ $$PWD/environment.h \ $$PWD/environmentmodel.h \ + $$PWD/environmentdialog.h \ $$PWD/qtcprocess.h \ $$PWD/utils_global.h \ $$PWD/reloadpromptutils.h \ diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index e3e337a31b0..721085d411e 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -393,44 +394,6 @@ void ExternalToolModel::removeTool(const QModelIndex &modelIndex) delete tool; } -EnvironmentChangesDialog::EnvironmentChangesDialog(QWidget *parent) : - QDialog(parent), - m_editor(0) -{ - setWindowTitle(tr("Edit Environment Changes")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - setModal(true); - - QVBoxLayout *layout = new QVBoxLayout(this); - QLabel *label = new QLabel(this); - label->setText(tr("Change system environment by assigning one environment variable per line:")); - layout->addWidget(label); - - m_editor = new QPlainTextEdit(this); - if (Utils::HostOsInfo::isWindowsHost()) - m_editor->setPlaceholderText(tr("PATH=C:\\dev\\bin;${PATH}")); - else - m_editor->setPlaceholderText(tr("PATH=/opt/bin:${PATH}")); - - QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); - - layout->addWidget(m_editor); - layout->addWidget(buttons); - - connect(buttons, &QDialogButtonBox::accepted, this, &EnvironmentChangesDialog::accept); - connect(buttons, &QDialogButtonBox::rejected, this, &EnvironmentChangesDialog::reject); -} - -QStringList EnvironmentChangesDialog::changes() const -{ - return m_editor->toPlainText().split(QLatin1Char('\n')); -} - -void EnvironmentChangesDialog::setChanges(const QStringList &changes) -{ - m_editor->setPlainText(changes.join(QLatin1Char('\n'))); -} - // #pragma mark -- ExternalToolConfig ExternalToolConfig::ExternalToolConfig(QWidget *parent) : @@ -556,7 +519,7 @@ void ExternalToolConfig::updateItem(const QModelIndex &index) tool->setExecutables(executables); tool->setArguments(ui->arguments->text()); tool->setWorkingDirectory(ui->workingDirectory->rawPath()); - tool->setEnvironment(Utils::EnvironmentItem::fromStringList(m_environment)); + tool->setEnvironment(m_environment); tool->setOutputHandling((ExternalTool::OutputHandling)ui->outputBehavior->currentIndex()); tool->setErrorHandling((ExternalTool::OutputHandling)ui->errorOutputBehavior->currentIndex()); tool->setModifiesCurrentDocument(ui->modifiesDocumentCheckbox->checkState()); @@ -585,7 +548,7 @@ void ExternalToolConfig::showInfoForItem(const QModelIndex &index) ui->outputBehavior->setCurrentIndex((int)tool->outputHandling()); ui->errorOutputBehavior->setCurrentIndex((int)tool->errorHandling()); ui->modifiesDocumentCheckbox->setChecked(tool->modifiesCurrentDocument()); - m_environment = Utils::EnvironmentItem::toStringList(tool->environment()); + m_environment = tool->environment(); bool blocked = ui->inputText->blockSignals(true); ui->inputText->setPlainText(tool->input()); @@ -649,17 +612,24 @@ void ExternalToolConfig::updateEffectiveArguments() void ExternalToolConfig::editEnvironmentChanges() { - EnvironmentChangesDialog dialog(ui->environmentLabel); - dialog.setChanges(m_environment); - if (dialog.exec() == QDialog::Accepted) { - m_environment = dialog.changes(); - updateEnvironmentLabel(); - } + bool ok; + const QString placeholderText = Utils::HostOsInfo::isWindowsHost() + ? tr("PATH=C:\\dev\\bin;${PATH}") + : tr("PATH=/opt/bin:${PATH}"); + const QList newItems = + Utils::EnvironmentDialog::getEnvironmentItems(&ok, ui->environmentLabel, + m_environment, + placeholderText); + if (!ok) + return; + + m_environment = newItems; + updateEnvironmentLabel(); } void ExternalToolConfig::updateEnvironmentLabel() { - QString shortSummary = m_environment.join(QLatin1String("; ")); + QString shortSummary = Utils::EnvironmentItem::toStringList(m_environment).join(QLatin1String("; ")); QFontMetrics fm(ui->environmentLabel->font()); shortSummary = fm.elidedText(shortSummary, Qt::ElideRight, ui->environmentLabel->width()); ui->environmentLabel->setText(shortSummary.isEmpty() ? tr("No changes to apply.") : shortSummary); diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.h b/src/plugins/coreplugin/dialogs/externaltoolconfig.h index 95eebcf0d96..1a2b72b1ac1 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.h +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.h @@ -33,6 +33,8 @@ QT_FORWARD_DECLARE_CLASS(QPlainTextEdit) +namespace Utils { class EnvironmentItem; } + namespace Core { namespace Internal { @@ -79,18 +81,6 @@ private: QMap > m_tools; }; -class EnvironmentChangesDialog : public QDialog -{ - Q_OBJECT -public: - explicit EnvironmentChangesDialog(QWidget *parent = 0); - - QStringList changes() const; - void setChanges(const QStringList &changes); -private: - QPlainTextEdit *m_editor; -}; - class ExternalToolConfig : public QWidget { Q_OBJECT @@ -118,7 +108,7 @@ private: void updateEnvironmentLabel(); Ui::ExternalToolConfig *ui; - QStringList m_environment; + QList m_environment; ExternalToolModel *m_model; }; diff --git a/src/plugins/projectexplorer/environmentitemswidget.cpp b/src/plugins/projectexplorer/environmentitemswidget.cpp deleted file mode 100644 index c35cbac9716..00000000000 --- a/src/plugins/projectexplorer/environmentitemswidget.cpp +++ /dev/null @@ -1,144 +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 "environmentitemswidget.h" - -#include -#include -#include -#include - -#include -#include - -namespace ProjectExplorer { - -class EnvironmentItemsWidgetPrivate -{ -public: - QList cleanUp( - const QList &items) const; - TextEditor::TextEditorWidget *m_editor; -}; - -QList EnvironmentItemsWidgetPrivate::cleanUp( - const QList &items) const -{ - QList uniqueItems; - QSet uniqueSet; - for (int i = items.count() - 1; i >= 0; i--) { - Utils::EnvironmentItem item = items.at(i); - if (Utils::HostOsInfo::isWindowsHost()) - item.name = item.name.toUpper(); - const QString &itemName = item.name; - QString emptyName = itemName; - emptyName.remove(QLatin1Char(' ')); - if (!emptyName.isEmpty() && !uniqueSet.contains(itemName)) { - uniqueItems.prepend(item); - uniqueSet.insert(itemName); - } - } - return uniqueItems; -} - -EnvironmentItemsWidget::EnvironmentItemsWidget(QWidget *parent) : - QWidget(parent), d(new EnvironmentItemsWidgetPrivate) -{ - d->m_editor = new TextEditor::SnippetEditorWidget(this); - auto layout = new QVBoxLayout(this); - layout->addWidget(d->m_editor); -} - -EnvironmentItemsWidget::~EnvironmentItemsWidget() -{ - delete d; -} - -void EnvironmentItemsWidget::setEnvironmentItems(const QList &items) -{ - QList sortedItems = items; - Utils::EnvironmentItem::sort(&sortedItems); - QStringList list = Utils::EnvironmentItem::toStringList(sortedItems); - d->m_editor->document()->setPlainText(list.join(QLatin1Char('\n'))); -} - -QList EnvironmentItemsWidget::environmentItems() const -{ - const QStringList list = d->m_editor->document()->toPlainText().split(QLatin1String("\n")); - QList items = Utils::EnvironmentItem::fromStringList(list); - return d->cleanUp(items); -} - - - -class EnvironmentItemsDialogPrivate -{ -public: - EnvironmentItemsWidget *m_editor; -}; - -EnvironmentItemsDialog::EnvironmentItemsDialog(QWidget *parent) : - QDialog(parent), d(new EnvironmentItemsDialogPrivate) -{ - resize(640, 480); - d->m_editor = new EnvironmentItemsWidget(this); - auto box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this); - connect(box, &QDialogButtonBox::accepted, this, &QDialog::accept); - connect(box, &QDialogButtonBox::rejected, this, &QDialog::reject); - auto layout = new QVBoxLayout(this); - layout->addWidget(d->m_editor); - layout->addWidget(box); - setWindowTitle(tr("Edit Environment")); -} - -EnvironmentItemsDialog::~EnvironmentItemsDialog() -{ - delete d; -} - -void EnvironmentItemsDialog::setEnvironmentItems(const QList &items) -{ - d->m_editor->setEnvironmentItems(items); -} - -QList EnvironmentItemsDialog::environmentItems() const -{ - return d->m_editor->environmentItems(); -} - -QList EnvironmentItemsDialog::getEnvironmentItems(QWidget *parent, - const QList &initial, bool *ok) -{ - EnvironmentItemsDialog dlg(parent); - dlg.setEnvironmentItems(initial); - bool result = dlg.exec() == QDialog::Accepted; - if (ok) - *ok = result; - if (result) - return dlg.environmentItems(); - return QList(); -} - -} // namespace ProjectExplorer diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp index ce5ea989afd..16e4395d4e2 100644 --- a/src/plugins/projectexplorer/environmentwidget.cpp +++ b/src/plugins/projectexplorer/environmentwidget.cpp @@ -24,13 +24,13 @@ ****************************************************************************/ #include "environmentwidget.h" -#include "environmentitemswidget.h" #include #include #include #include +#include #include #include #include @@ -340,9 +340,11 @@ void EnvironmentWidget::batchEditEnvironmentButtonClicked() const QList changes = d->m_model->userChanges(); bool ok; - const QList newChanges = EnvironmentItemsDialog::getEnvironmentItems(this, changes, &ok); - if (ok) - d->m_model->setUserChanges(newChanges); + const QList newChanges = Utils::EnvironmentDialog::getEnvironmentItems(&ok, this, changes); + if (!ok) + return; + + d->m_model->setUserChanges(newChanges); } void EnvironmentWidget::environmentCurrentIndexChanged(const QModelIndex ¤t) diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp index 30d98473382..64a8f267123 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.cpp +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -400,78 +401,38 @@ QString KitEnvironmentConfigWidget::toolTip() const void KitEnvironmentConfigWidget::refresh() { - QList changes = EnvironmentKitInformation::environmentChanges(m_kit); - Utils::sort(changes, [](const Utils::EnvironmentItem &lhs, const Utils::EnvironmentItem &rhs) - { return QString::localeAwareCompare(lhs.name, rhs.name) < 0; }); + const QList changes = currentEnvironment(); QString shortSummary = Utils::EnvironmentItem::toStringList(changes).join(QLatin1String("; ")); QFontMetrics fm(m_summaryLabel->font()); shortSummary = fm.elidedText(shortSummary, Qt::ElideRight, m_summaryLabel->width()); m_summaryLabel->setText(shortSummary.isEmpty() ? tr("No changes to apply.") : shortSummary); - if (m_editor) - m_editor->setPlainText(Utils::EnvironmentItem::toStringList(changes).join(QLatin1Char('\n'))); } void KitEnvironmentConfigWidget::makeReadOnly() { m_manageButton->setEnabled(false); - if (m_dialog) - m_dialog->reject(); +} + +QList KitEnvironmentConfigWidget::currentEnvironment() const +{ + QList changes = EnvironmentKitInformation::environmentChanges(m_kit); + Utils::sort(changes, [](const Utils::EnvironmentItem &lhs, const Utils::EnvironmentItem &rhs) + { return QString::localeAwareCompare(lhs.name, rhs.name) < 0; }); + return changes; } void KitEnvironmentConfigWidget::editEnvironmentChanges() { - if (m_dialog) { - m_dialog->activateWindow(); - m_dialog->raise(); + bool ok; + const QList changes = Utils::EnvironmentDialog::getEnvironmentItems(&ok, + m_summaryLabel, + currentEnvironment()); + if (!ok) return; - } - QTC_ASSERT(!m_editor, return); - - m_dialog = new QDialog(m_summaryLabel); - m_dialog->setWindowTitle(tr("Edit Environment Changes")); - auto layout = new QVBoxLayout(m_dialog); - m_editor = new QPlainTextEdit; - m_editor->setToolTip(tr("Enter one variable per line with the variable name " - "separated from the variable value by \"=\".
" - "Environment variables can be referenced with ${OTHER}.")); - - auto buttons = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Apply|QDialogButtonBox::Cancel); - - layout->addWidget(m_editor); - layout->addWidget(buttons); - - connect(buttons, &QDialogButtonBox::accepted, m_dialog, &QDialog::accept); - connect(buttons, &QDialogButtonBox::rejected, m_dialog, &QDialog::reject); - connect(m_dialog, &QDialog::accepted, this, &KitEnvironmentConfigWidget::acceptChangesDialog); - connect(m_dialog, &QDialog::rejected, this, &KitEnvironmentConfigWidget::closeChangesDialog); - connect(buttons->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, - this, &KitEnvironmentConfigWidget::applyChanges); - - refresh(); - m_dialog->show(); -} - -void KitEnvironmentConfigWidget::applyChanges() -{ - QTC_ASSERT(m_editor, return); - auto changes = Utils::EnvironmentItem::fromStringList(m_editor->toPlainText().split(QLatin1Char('\n'))); EnvironmentKitInformation::setEnvironmentChanges(m_kit, changes); } -void KitEnvironmentConfigWidget::closeChangesDialog() -{ - m_dialog->deleteLater(); - m_dialog = nullptr; - m_editor = nullptr; -} - -void KitEnvironmentConfigWidget::acceptChangesDialog() -{ - applyChanges(); - closeChangesDialog(); -} - QWidget *KitEnvironmentConfigWidget::buttonWidget() const { return m_manageButton; diff --git a/src/plugins/projectexplorer/kitinformationconfigwidget.h b/src/plugins/projectexplorer/kitinformationconfigwidget.h index 5f1f6c28034..2daecc8ff56 100644 --- a/src/plugins/projectexplorer/kitinformationconfigwidget.h +++ b/src/plugins/projectexplorer/kitinformationconfigwidget.h @@ -179,15 +179,10 @@ public: private: void editEnvironmentChanges(); - - void applyChanges(); - void closeChangesDialog(); - void acceptChangesDialog(); + QList currentEnvironment() const; QLabel *m_summaryLabel; QPushButton *m_manageButton; - QDialog *m_dialog = 0; - QPlainTextEdit *m_editor = 0; }; } // namespace Internal diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index ee76f629afe..fccf8773985 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -110,7 +110,6 @@ HEADERS += projectexplorer.h \ appoutputpane.h \ codestylesettingspropertiespage.h \ settingsaccessor.h \ - environmentitemswidget.h \ deployablefile.h \ devicesupport/idevice.h \ devicesupport/desktopdevice.h \ @@ -258,7 +257,6 @@ SOURCES += projectexplorer.cpp \ appoutputpane.cpp \ codestylesettingspropertiespage.cpp \ settingsaccessor.cpp \ - environmentitemswidget.cpp \ devicesupport/idevice.cpp \ devicesupport/desktopdevice.cpp \ devicesupport/desktopdevicefactory.cpp \