diff options
author | jkobus <jaroslaw.kobus@digia.com> | 2013-11-05 14:03:59 +0100 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2013-11-05 14:46:35 +0100 |
commit | 686e523f297d5e291d3d33887b01bee11600c361 (patch) | |
tree | 74ed48e2194228322a69a39781e45a3d5f89f619 | |
parent | 18584e9546eab487e5d239260a5413e43af56bf1 (diff) | |
download | qt-creator-686e523f297d5e291d3d33887b01bee11600c361.tar.gz |
Removed unused ui file
Change-Id: Idb9e39ff155ff7dd36f490983ae978681e47fb18
Reviewed-by: hjk <hjk121@nokiamail.com>
4 files changed, 3 insertions, 60 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro index dde5635f5a..2b55092588 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.pro @@ -118,8 +118,7 @@ FORMS += makestep.ui \ qmakeprojectconfigwidget.ui \ librarydetailswidget.ui \ wizards/testwizardpage.ui \ - wizards/html5appwizardsourcespage.ui \ - wizards/qtquickcomponentsetoptionspage.ui + wizards/html5appwizardsourcespage.ui RESOURCES += qmakeprojectmanager.qrc \ wizards/wizards.qrc diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs index 7fce3a8cbd..eaddefb367 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanager.qbs @@ -108,7 +108,6 @@ QtcPlugin { "qtquickapp.cpp", "qtquickapp.h", "qtquickappwizard.cpp", "qtquickappwizard.h", "qtquickappwizardpages.cpp", "qtquickappwizardpages.h", - "qtquickcomponentsetoptionspage.ui", "qtwizard.cpp", "qtwizard.h", "subdirsprojectwizard.cpp", "subdirsprojectwizard.h", "subdirsprojectwizarddialog.cpp", "subdirsprojectwizarddialog.h", diff --git a/src/plugins/qmakeprojectmanager/wizards/qtquickappwizardpages.cpp b/src/plugins/qmakeprojectmanager/wizards/qtquickappwizardpages.cpp index 0621063375..0ba72a631c 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtquickappwizardpages.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/qtquickappwizardpages.cpp @@ -28,8 +28,9 @@ ****************************************************************************/ #include "qtquickappwizardpages.h" -#include "ui_qtquickcomponentsetoptionspage.h" #include <QComboBox> +#include <QLabel> +#include <QVBoxLayout> namespace QmakeProjectManager { namespace Internal { diff --git a/src/plugins/qmakeprojectmanager/wizards/qtquickcomponentsetoptionspage.ui b/src/plugins/qmakeprojectmanager/wizards/qtquickcomponentsetoptionspage.ui deleted file mode 100644 index df791b10bc..0000000000 --- a/src/plugins/qmakeprojectmanager/wizards/qtquickcomponentsetoptionspage.ui +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>QmakeProjectManager::Internal::QtQuickComponentSetOptionsPage</class> - <widget class="QWizardPage" name="QmakeProjectManager::Internal::QtQuickComponentSetOptionsPage"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>400</width> - <height>300</height> - </rect> - </property> - <property name="windowTitle"> - <string/> - </property> - <property name="title"> - <string/> - </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="Utils::PathChooser" name="importLineEdit" native="true"> - <property name="enabled"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="importDescriptionLabel"> - <property name="text"> - <string>All files and directories that reside in the same directory as the main QML file are deployed. You can modify the contents of the directory any time before deploying.</string> - </property> - <property name="alignment"> - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> - </property> - <property name="wordWrap"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>Utils::PathChooser</class> - <extends>QWidget</extends> - <header location="global">utils/pathchooser.h</header> - <container>1</container> - <slots> - <signal>editingFinished()</signal> - <signal>browsingFinished()</signal> - </slots> - </customwidget> - </customwidgets> - <resources/> - <connections/> -</ui> |