feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix compile, remove embeddedpropertiespage

Browse Source
This commit is contained in:
dt
2009-11-30 15:56:42 +01:00
parent 9c66c06820
commit 8151563f64
5 changed files with 0 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
src/plugins/qt4projectmanager/embeddedpropertiespage.cpp
View File

@@ -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()
{
}

85
src/plugins/qt4projectmanager/embeddedpropertiespage.h
View File

@@ -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

46
src/plugins/qt4projectmanager/embeddedpropertiespage.ui
View File

@@ -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&#xd;
Note: This adds the toolchain to the build environment and runs the program inside a virtual machine.&#xd;
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>

3
src/plugins/qt4projectmanager/qt4projectmanager.pro
View File

@@ -28,7 +28,6 @@ HEADERS += qt4projectmanagerplugin.h \
qt4projectmanagerconstants.h \ qt4projectmanagerconstants.h \
makestep.h \ makestep.h \
qmakestep.h \ qmakestep.h \
embeddedpropertiespage.h \
qt4runconfiguration.h \ qt4runconfiguration.h \
qtmodulesinfo.h \ qtmodulesinfo.h \
qt4projectconfigwidget.h \ qt4projectconfigwidget.h \
@@ -64,7 +63,6 @@ SOURCES += qt4projectmanagerplugin.cpp \
wizards/qtwizard.cpp \ wizards/qtwizard.cpp \
makestep.cpp \ makestep.cpp \
qmakestep.cpp \ qmakestep.cpp \
embeddedpropertiespage.cpp \
qt4runconfiguration.cpp \ qt4runconfiguration.cpp \
qtmodulesinfo.cpp \ qtmodulesinfo.cpp \
qt4projectconfigwidget.cpp \ qt4projectconfigwidget.cpp \
@@ -80,7 +78,6 @@ SOURCES += qt4projectmanagerplugin.cpp \
FORMS += makestep.ui \ FORMS += makestep.ui \
qmakestep.ui \ qmakestep.ui \
qt4projectconfigwidget.ui \ qt4projectconfigwidget.ui \
embeddedpropertiespage.ui \
qtversionmanager.ui \ qtversionmanager.ui \
showbuildlog.ui \ showbuildlog.ui \
gettingstartedwelcomepagewidget.ui gettingstartedwelcomepagewidget.ui

1
src/plugins/qt4projectmanager/qt4projectmanagerplugin.cpp
View File

@@ -38,7 +38,6 @@
#include "profileeditorfactory.h" #include "profileeditorfactory.h"
#include "qt4projectmanagerconstants.h" #include "qt4projectmanagerconstants.h"
#include "qt4project.h" #include "qt4project.h"
#include "embeddedpropertiespage.h"
#include "qt4runconfiguration.h" #include "qt4runconfiguration.h"
#include "profilereader.h" #include "profilereader.h"
#include "qtversionmanager.h" #include "qtversionmanager.h"