From 8151563f647fa1f1649e0849ed6494b6c6f8ea9b Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 30 Nov 2009 15:56:42 +0100
Subject: [PATCH] Fix compile, remove embeddedpropertiespage
---
.../embeddedpropertiespage.cpp | 141 ------------------
.../embeddedpropertiespage.h | 85 -----------
.../embeddedpropertiespage.ui | 46 ------
.../qt4projectmanager/qt4projectmanager.pro | 3 -
.../qt4projectmanagerplugin.cpp | 1 -
5 files changed, 276 deletions(-)
delete mode 100644 src/plugins/qt4projectmanager/embeddedpropertiespage.cpp
delete mode 100644 src/plugins/qt4projectmanager/embeddedpropertiespage.h
delete mode 100644 src/plugins/qt4projectmanager/embeddedpropertiespage.ui
diff --git a/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp b/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp
deleted file mode 100644
index 2fa903fe3ab..00000000000
--- a/src/plugins/qt4projectmanager/embeddedpropertiespage.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#include "embeddedpropertiespage.h"
-#include "qt4project.h"
-
-#include <QFileInfo>
-#include <QDir>
-
-using namespace ProjectExplorer;
-using namespace Qt4ProjectManager;
-using namespace Qt4ProjectManager::Internal;
-
-///
-/// EmbeddedPropertiesPanelFactory
-///
-
-bool EmbeddedPropertiesPanelFactory::supports(Project *project)
-{
-#ifdef Q_OS_WIN
- Qt4Project *pro = qobject_cast<Qt4Project *>(project);
- if (pro) {
- return true;
- }
-#else
- Q_UNUSED(project)
-#endif
- return false;
-}
-
-ProjectExplorer::IPropertiesPanel *EmbeddedPropertiesPanelFactory::createPanel(
- ProjectExplorer::Project *project)
-{
- return new EmbeddedPropertiesPanel(project);
-}
-
-///
-/// EmbeddedPropertiesPanel
-///
-
-EmbeddedPropertiesPanel::EmbeddedPropertiesPanel(ProjectExplorer::Project *project) :
- m_widget(new EmbeddedPropertiesWidget(project)),
- m_icon(":/projectexplorer/images/rebuild.png")
-{
-}
-
-EmbeddedPropertiesPanel::~EmbeddedPropertiesPanel()
-{
- delete m_widget;
-}
-
-QString EmbeddedPropertiesPanel::name() const
-{
- return QApplication::tr("Embedded Linux");
-}
-
-QWidget *EmbeddedPropertiesPanel::widget() const
-{
- return m_widget;
-}
-
-QIcon EmbeddedPropertiesPanel::icon() const
-{
- return m_icon;
-}
-
-///
-/// EmbeddedPropertiesWidget
-///
-
-EmbeddedPropertiesWidget::EmbeddedPropertiesWidget(ProjectExplorer::Project *project)
- : QWidget()
-{
- m_ui.setupUi(this);
-
-#ifdef Q_OS_WIN
- m_ui.virtualBoxCheckbox->setChecked(project->value("useVBOX").toBool());
-
- // Find all skins
- QString skin = QFileInfo(project->value("VNCSkin").toString()).fileName();
- QStringList skins;
-
- QDir skinDir = QApplication::applicationDirPath();
- skinDir.cdUp();
- if (skinDir.cd("qtembeddedtools") && skinDir.cd("qsimplevnc")) {
- skins = skinDir.entryList( QDir::Dirs | QDir::NoDotAndDotDot );
- }
- m_ui.skinComboBox->clear();
- m_ui.skinComboBox->addItems(skins);
- if (!skin.isEmpty()) {
- int index = m_ui.skinComboBox->findText(skin);
- if (index != -1)
- m_ui.skinComboBox->setCurrentIndex(index);
- }
-#else
- Q_UNUSED(project)
-#endif
- //TODO readd finish code
- /*
- project->setValue("useVBOX", m_ui.virtualBoxCheckbox->isChecked());
-
- //Skin
- QDir skinDir = QApplication::applicationDirPath();
- skinDir.cdUp();
- skinDir.cd("qtembeddedtools");
- skinDir.cd("qsimplevnc");
- project->setValue("VNCSkin", skinDir.absolutePath() + "/" + m_ui.skinComboBox->currentText() + "/" + m_ui.skinComboBox->currentText());
-
- */
-}
-
-EmbeddedPropertiesWidget::~EmbeddedPropertiesWidget()
-{
-}
-
diff --git a/src/plugins/qt4projectmanager/embeddedpropertiespage.h b/src/plugins/qt4projectmanager/embeddedpropertiespage.h
deleted file mode 100644
index 06342974c00..00000000000
--- a/src/plugins/qt4projectmanager/embeddedpropertiespage.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** 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.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#ifndef EMBEDDEDPROPERTIESPAGE_H
-#define EMBEDDEDPROPERTIESPAGE_H
-
-#include "ui_embeddedpropertiespage.h"
-
-#include <projectexplorer/iprojectproperties.h>
-
-#include <QtCore/QModelIndex>
-
-namespace ProjectExplorer {
-class Project;
-}
-
-namespace Qt4ProjectManager {
-
-namespace Internal {
-
-class EmbeddedPropertiesWidget;
-
-class EmbeddedPropertiesPanelFactory : public ProjectExplorer::IPanelFactory
-{
-public:
- virtual bool supports(ProjectExplorer::Project *project);
- ProjectExplorer::IPropertiesPanel *createPanel(ProjectExplorer::Project *project);
-};
-
-class EmbeddedPropertiesPanel : public ProjectExplorer::IPropertiesPanel
-{
-public:
- EmbeddedPropertiesPanel(ProjectExplorer::Project *project);
- ~EmbeddedPropertiesPanel();
-
- QString name() const;
- QWidget *widget() const;
- QIcon icon() const;
-
-private:
- EmbeddedPropertiesWidget *m_widget;
- QIcon m_icon;
-};
-
-class EmbeddedPropertiesWidget : public QWidget
-{
- Q_OBJECT
-public:
- EmbeddedPropertiesWidget(ProjectExplorer::Project *project);
- virtual ~EmbeddedPropertiesWidget();
- private:
- Ui_EmbeddedPropertiesPage m_ui;
- ProjectExplorer::Project *m_pro;
-};
-
-} // namespace Internal
-} // namespace Qt4ProjectManager
-
-#endif // EMBEDDEDPROPERTIESPAGE_H
diff --git a/src/plugins/qt4projectmanager/embeddedpropertiespage.ui b/src/plugins/qt4projectmanager/embeddedpropertiespage.ui
deleted file mode 100644
index f4f42aa80cb..00000000000
--- a/src/plugins/qt4projectmanager/embeddedpropertiespage.ui
+++ /dev/null
@@ -1,46 +0,0 @@
-<ui version="4.0" >
- <class>EmbeddedPropertiesPage</class>
- <widget class="QWidget" name="EmbeddedPropertiesPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>649</width>
- <height>302</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout" >
- <item>
- <layout class="QFormLayout" name="formLayout" >
- <property name="fieldGrowthPolicy" >
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="1" >
- <widget class="QCheckBox" name="virtualBoxCheckbox" >
- <property name="text" >
- <string>Use Virtual Box
-Note: This adds the toolchain to the build environment and runs the program inside a virtual machine.
-It also automatically sets the correct Qt version.</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="skinLabel" >
- <property name="text" >
- <string>Skin:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QComboBox" name="skinComboBox" />
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index 556deeb6a14..d3847c1202b 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -28,7 +28,6 @@ HEADERS += qt4projectmanagerplugin.h \
qt4projectmanagerconstants.h \
makestep.h \
qmakestep.h \
- embeddedpropertiespage.h \
qt4runconfiguration.h \
qtmodulesinfo.h \
qt4projectconfigwidget.h \
@@ -64,7 +63,6 @@ SOURCES += qt4projectmanagerplugin.cpp \
wizards/qtwizard.cpp \
makestep.cpp \
qmakestep.cpp \
- embeddedpropertiespage.cpp \
qt4runconfiguration.cpp \
qtmodulesinfo.cpp \
qt4projectconfigwidget.cpp \
@@ -80,7 +78,6 @@ SOURCES += qt4projectmanagerplugin.cpp \
FORMS += makestep.ui \
qmakestep.ui \
qt4projectconfigwidget.ui \
- embeddedpropertiespage.ui \
qtversionmanager.ui \
showbuildlog.ui \
gettingstartedwelcomepagewidget.ui
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
index 9471e3d1f30..a6fbe1c9806 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
@@ -38,7 +38,6 @@
#include "profileeditorfactory.h"
#include "qt4projectmanagerconstants.h"
#include "qt4project.h"
-#include "embeddedpropertiespage.h"
#include "qt4runconfiguration.h"
#include "profilereader.h"
#include "qtversionmanager.h"
--
GitLab