summaryrefslogtreecommitdiff
path: root/src/plugins/qt4projectmanager/wizards
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2011-11-23 15:15:01 +0000
committerhjk <qthjk@ovi.com>2011-11-24 10:49:41 +0100
commit0ce9fa2c16073f85ed17890088f6e40f523ce928 (patch)
treeb9baa3db68e42a3edb545b20fd003bbc49a321ba /src/plugins/qt4projectmanager/wizards
parent88fd98fbc4dc15afa4f42f84045dcdff38b9b301 (diff)
downloadqt-creator-0ce9fa2c16073f85ed17890088f6e40f523ce928.tar.gz
UI files: Do not polute the global Ui namespace
Make sure all ui-files are in the plugin's internal namespace. Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/qt4projectmanager/wizards')
-rw-r--r--src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui8
-rw-r--r--src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui4
-rw-r--r--src/plugins/qt4projectmanager/wizards/mobileappwizardharmattanoptionspage.ui4
-rw-r--r--src/plugins/qt4projectmanager/wizards/mobileappwizardmaemooptionspage.ui4
-rw-r--r--src/plugins/qt4projectmanager/wizards/mobileappwizardsymbianoptionspage.ui6
-rw-r--r--src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui6
-rw-r--r--src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui322
7 files changed, 177 insertions, 177 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui b/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui
index 85a7ca0f0f..65d5854170 100644
--- a/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui
+++ b/src/plugins/qt4projectmanager/wizards/html5appwizardsourcespage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>Html5AppWizardSourcesPage</class>
- <widget class="QWizardPage" name="Html5AppWizardSourcesPage">
+ <class>Qt4ProjectManager::Internal::Html5AppWizardSourcesPage</class>
+ <widget class="QWizardPage" name="Qt4ProjectManager::Internal::Html5AppWizardSourcesPage">
<property name="geometry">
<rect>
<x>0</x>
@@ -38,7 +38,7 @@
</widget>
</item>
<item row="2" column="1">
- <widget class="Utils::PathChooser" name="importLineEdit">
+ <widget class="Utils::PathChooser" name="importLineEdit" native="true">
<property name="enabled">
<bool>true</bool>
</property>
@@ -162,7 +162,7 @@
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
- <extends>QLineEdit</extends>
+ <extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
<slots>
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui b/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui
index 337fdbc7d3..e82630a631 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardgenericoptionspage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MobileAppWizardGenericOptionsPage</class>
- <widget class="QWizardPage" name="MobileAppWizardGenericOptionsPage">
+ <class>Qt4ProjectManager::Internal::MobileAppWizardGenericOptionsPage</class>
+ <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileAppWizardGenericOptionsPage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardharmattanoptionspage.ui b/src/plugins/qt4projectmanager/wizards/mobileappwizardharmattanoptionspage.ui
index 7354c26ecc..864fc7ee6c 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizardharmattanoptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardharmattanoptionspage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MobileAppWizardHarmattanOptionsPage</class>
- <widget class="QWizardPage" name="MobileAppWizardHarmattanOptionsPage">
+ <class>Qt4ProjectManager::Internal::MobileAppWizardHarmattanOptionsPage</class>
+ <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileAppWizardHarmattanOptionsPage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardmaemooptionspage.ui b/src/plugins/qt4projectmanager/wizards/mobileappwizardmaemooptionspage.ui
index 20f1f979d2..4a9fe0d563 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizardmaemooptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardmaemooptionspage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MobileAppWizardMaemoOptionsPage</class>
- <widget class="QWizardPage" name="MobileAppWizardMaemoOptionsPage">
+ <class>Qt4ProjectManager::Internal::MobileAppWizardMaemoOptionsPage</class>
+ <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileAppWizardMaemoOptionsPage">
<property name="geometry">
<rect>
<x>0</x>
diff --git a/src/plugins/qt4projectmanager/wizards/mobileappwizardsymbianoptionspage.ui b/src/plugins/qt4projectmanager/wizards/mobileappwizardsymbianoptionspage.ui
index a4dfcb7967..2a900fc8bc 100644
--- a/src/plugins/qt4projectmanager/wizards/mobileappwizardsymbianoptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/mobileappwizardsymbianoptionspage.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MobileAppWizardSymbianOptionsPage</class>
- <widget class="QWizardPage" name="MobileAppWizardSymbianOptionsPage">
+ <class>Qt4ProjectManager::Internal::MobileAppWizardSymbianOptionsPage</class>
+ <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileAppWizardSymbianOptionsPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>315</width>
- <height>116</height>
+ <height>125</height>
</rect>
</property>
<property name="windowTitle">
diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui
index c42815fe0b..429b1face4 100644
--- a/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui
+++ b/src/plugins/qt4projectmanager/wizards/mobilelibrarywizardoptionpage.ui
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>MobileLibraryWizardOptionPage</class>
- <widget class="QWizardPage" name="MobileLibraryWizardOptionPage">
+ <class>Qt4ProjectManager::Internal::MobileLibraryWizardOptionPage</class>
+ <widget class="QWizardPage" name="Qt4ProjectManager::Internal::MobileLibraryWizardOptionPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>404</width>
- <height>130</height>
+ <height>131</height>
</rect>
</property>
<property name="windowTitle">
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
index 43437de33a..70ea88a0fc 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
+++ b/src/plugins/qt4projectmanager/wizards/qtquickcomponentsetoptionspage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>QtQuickComponentSetOptionsPage</class>
- <widget class="QWizardPage" name="QtQuickComponentSetOptionsPage">
+ <class>Qt4ProjectManager::Internal::QtQuickComponentSetOptionsPage</class>
+ <widget class="QWizardPage" name="Qt4ProjectManager::Internal::QtQuickComponentSetOptionsPage">
<property name="geometry">
<rect>
<x>0</x>
@@ -16,180 +16,180 @@
<property name="title">
<string/>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QRadioButton" name="qtquick10RadioButton">
- <property name="text">
- <string>Built-in elements only (for all platforms)</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <attribute name="buttonGroup">
- <string notr="true">buttonGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="symbian10RadioButton">
- <property name="text">
- <string>Qt Quick Components for Symbian</string>
- </property>
- <attribute name="buttonGroup">
- <string notr="true">buttonGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="meego10RadioButton">
- <property name="text">
- <string>Qt Quick Components for MeeGo/Harmattan</string>
- </property>
- <attribute name="buttonGroup">
- <string notr="true">buttonGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="importRadioButton">
- <property name="text">
- <string>Use an existing .qml file</string>
- </property>
- <attribute name="buttonGroup">
- <string notr="true">buttonGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>12</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="Utils::PathChooser" name="importLineEdit">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QStackedWidget" name="descriptionStackedWidget">
- <property name="currentIndex">
- <number>3</number>
- </property>
- <widget class="QWidget" name="qtquick10DescriptionWidget">
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="qtquick10DescriptionLabel">
- <property name="text">
- <string>The built-in elements in the QtQuick namespace allow you to write cross-platform applications with a custom look and feel.
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QRadioButton" name="qtquick10RadioButton">
+ <property name="text">
+ <string>Built-in elements only (for all platforms)</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="symbian10RadioButton">
+ <property name="text">
+ <string>Qt Quick Components for Symbian</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="meego10RadioButton">
+ <property name="text">
+ <string>Qt Quick Components for MeeGo/Harmattan</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="importRadioButton">
+ <property name="text">
+ <string>Use an existing .qml file</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">buttonGroup</string>
+ </attribute>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Maximum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>12</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="Utils::PathChooser" name="importLineEdit" native="true">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QStackedWidget" name="descriptionStackedWidget">
+ <property name="currentIndex">
+ <number>3</number>
+ </property>
+ <widget class="QWidget" name="qtquick10DescriptionWidget">
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="qtquick10DescriptionLabel">
+ <property name="text">
+ <string>The built-in elements in the QtQuick namespace allow you to write cross-platform applications with a custom look and feel.
Requires Qt 4.7.1 or newer.</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
- <widget class="QWidget" name="symbian10DescriptionWidget">
- <layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
- <widget class="QLabel" name="symbian10DescriptionLabel">
- <property name="text">
- <string>The Qt Quick Components for Symbian are a set of ready-made components that are designed with specific native appearance for the Symbian platform.
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="symbian10DescriptionWidget">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="symbian10DescriptionLabel">
+ <property name="text">
+ <string>The Qt Quick Components for Symbian are a set of ready-made components that are designed with specific native appearance for the Symbian platform.
Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
- <widget class="QWidget" name="meego10DescriptionWidget">
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <widget class="QLabel" name="meego1DescriptionLabel">
- <property name="text">
- <string>The Qt Quick Components for MeeGo/Harmattan are a set of ready-made components that are designed with specific native appearance for the MeeGo/Harmattan platform.
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="meego10DescriptionWidget">
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="meego1DescriptionLabel">
+ <property name="text">
+ <string>The Qt Quick Components for MeeGo/Harmattan are a set of ready-made components that are designed with specific native appearance for the MeeGo/Harmattan platform.
Requires Qt 4.7.4 or newer, and the component set installed for your Qt version.</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
</widget>
- <widget class="QWidget" name="importDescriptionWidget">
- <layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0">
- <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>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="importDescriptionWidget">
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="0" column="0">
+ <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>
- </widget>
- </item>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Utils::PathChooser</class>
- <extends>QLineEdit</extends>
+ <extends>QWidget</extends>
<header location="global">utils/pathchooser.h</header>
<container>1</container>
<slots>