diff options
author | Leena Miettinen <riitta-leena.miettinen@digia.com> | 2012-12-10 17:13:49 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 17:32:01 +0100 |
commit | aa7e06a7fa9aadccef72a4f46e3c8f3b0bec9d7c (patch) | |
tree | 4f16195b18331ca30b04bda6e716b3af25938930 | |
parent | c6f17e396a487c198905615411b0d167a376c4cf (diff) |
Doc: Modularize Qt UI Tools documentation
Add qtuitools to qtdoc-project.qdocconf. Remove files and
text that were moved to qttools.
Related to change: I156dbf0a071137e1e6f3ba99cc390aa88c80b836.
Change-Id: Ibf78d75267db5429f3d37b7f4834aadd8ab6f1e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r-- | doc/config/qtdoc-project.qdocconf | 1 | ||||
-rw-r--r-- | doc/src/getting-started/examples.qdoc | 13 | ||||
-rw-r--r-- | doc/src/images/textfinder-example-find.png | bin | 15837 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/textfinder-example-find2.png | bin | 15745 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/textfinder-example.png | bin | 15424 -> 0 bytes | |||
-rw-r--r-- | doc/src/images/uitools-examples.png | bin | 12021 -> 0 bytes | |||
-rw-r--r-- | doc/src/modules.qdoc | 34 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_qtuiloader.cpp | 43 | ||||
-rw-r--r-- | doc/src/snippets/code/doc_src_qtuiloader.pro | 43 | ||||
-rw-r--r-- | doc/src/snippets/quiloader/myform.ui | 130 | ||||
-rw-r--r-- | doc/src/snippets/quiloader/mywidget.h | 52 | ||||
-rw-r--r-- | doc/src/snippets/quiloader/quiloader.pro | 4 |
12 files changed, 1 insertions, 319 deletions
diff --git a/doc/config/qtdoc-project.qdocconf b/doc/config/qtdoc-project.qdocconf index 84a52aead..52818ab94 100644 --- a/doc/config/qtdoc-project.qdocconf +++ b/doc/config/qtdoc-project.qdocconf @@ -36,6 +36,7 @@ depends += \ qtsysteminfo \ qttestlib \ qttools \ + qtuitools \ qtversit \ qtwidgets \ qtwebkit \ diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index e5d39483d..5453b8ab3 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -417,19 +417,6 @@ */ /*! - \page examples-uitools.html - \title UiTools Examples - \brief Using the QtUiTools module. - - \image uitools-examples.png UiTools - - \list - \li \l{uitools/multipleinheritance}{Multiple Inheritance}\raisedaster - \li \l{uitools/textfinder}{Text Finder}\raisedaster - \endlist -*/ - -/*! \page examples-webkit.html \ingroup all-examples \title WebKit Examples diff --git a/doc/src/images/textfinder-example-find.png b/doc/src/images/textfinder-example-find.png Binary files differdeleted file mode 100644 index 886bbc110..000000000 --- a/doc/src/images/textfinder-example-find.png +++ /dev/null diff --git a/doc/src/images/textfinder-example-find2.png b/doc/src/images/textfinder-example-find2.png Binary files differdeleted file mode 100644 index 908f11409..000000000 --- a/doc/src/images/textfinder-example-find2.png +++ /dev/null diff --git a/doc/src/images/textfinder-example.png b/doc/src/images/textfinder-example.png Binary files differdeleted file mode 100644 index 87322df98..000000000 --- a/doc/src/images/textfinder-example.png +++ /dev/null diff --git a/doc/src/images/uitools-examples.png b/doc/src/images/uitools-examples.png Binary files differdeleted file mode 100644 index 8c85cdb76..000000000 --- a/doc/src/images/uitools-examples.png +++ /dev/null diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc index 533c1e7ef..804d4d99c 100644 --- a/doc/src/modules.qdoc +++ b/doc/src/modules.qdoc @@ -258,40 +258,6 @@ */ /*! - \module QtUiTools - \title QtUiTools Module - \since 4.1 - \ingroup modules - - \brief The QtUiTools module provides classes to handle forms created - with Qt Designer. - - These forms are processed at run-time to produce dynamically-generated - user interfaces. In order to generate a form at run-time, a resource - file containing a UI file is needed. Applications that use the - form handling classes need to be configured to be built against the - QtUiTools module. This is done by including the following declaration - in a \c qmake project file to ensure that the application is compiled - and linked appropriately. - - \snippet doc/src/snippets/code/doc_src_qtuiloader.pro 0 - - A form loader object, provided by the QUiLoader class, is used to - construct the user interface. This user interface can - be retrieved from any QIODevice; for example, a QFile object can be - used to obtain a form stored in a project's resources. The - QUiLoader::load() function takes the user interface description - contained in the file and constructs the form widget. - - To include the definitions of the module's classes, use the following - directive: - - \snippet doc/src/snippets/code/doc_src_qtuiloader.cpp 1 - - \sa {Calculator Builder Example}, {World Time Clock Builder Example} -*/ - -/*! \module QAxContainer \title QAxContainer Module \ingroup modules diff --git a/doc/src/snippets/code/doc_src_qtuiloader.cpp b/doc/src/snippets/code/doc_src_qtuiloader.cpp deleted file mode 100644 index 208ff7f0a..000000000 --- a/doc/src/snippets/code/doc_src_qtuiloader.cpp +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//! [1] -#include <QtUiTools> -//! [1] diff --git a/doc/src/snippets/code/doc_src_qtuiloader.pro b/doc/src/snippets/code/doc_src_qtuiloader.pro deleted file mode 100644 index c99db38db..000000000 --- a/doc/src/snippets/code/doc_src_qtuiloader.pro +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#! [0] -QT += uitools -#! [0] diff --git a/doc/src/snippets/quiloader/myform.ui b/doc/src/snippets/quiloader/myform.ui deleted file mode 100644 index 00702e860..000000000 --- a/doc/src/snippets/quiloader/myform.ui +++ /dev/null @@ -1,130 +0,0 @@ -<ui version="4.0" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>Form</class> - <widget class="QWidget" name="Form" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>258</width> - <height>224</height> - </rect> - </property> - <property name="windowTitle" > - <string>Export Document</string> - </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>8</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QGroupBox" name="groupBox" > - <property name="title" > - <string>Export Options</string> - </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>8</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="1" column="0" > - <widget class="QRadioButton" name="radioButton_2" > - <property name="text" > - <string>&DocBook</string> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QRadioButton" name="radioButton" > - <property name="text" > - <string>&LaTeX</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="QCheckBox" name="checkBox_2" > - <property name="text" > - <string>Include p&ictures</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - <item row="5" column="0" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>40</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="1" > - <widget class="QCheckBox" name="checkBox" > - <property name="text" > - <string>&Compress</string> - </property> - </widget> - </item> - <item row="2" column="0" > - <widget class="QRadioButton" name="radioButton_2_2" > - <property name="text" > - <string>&HTML</string> - </property> - </widget> - </item> - <item row="3" column="0" > - <widget class="QRadioButton" name="radioButton_3" > - <property name="text" > - <string>&PostScript</string> - </property> - </widget> - </item> - <item row="4" column="0" > - <widget class="QRadioButton" name="radioButton_4" > - <property name="text" > - <string>PD&F</string> - </property> - </widget> - </item> - <item row="2" column="1" > - <widget class="QCheckBox" name="checkBox_3" > - <property name="text" > - <string>Include &metadata</string> - </property> - </widget> - </item> - <item row="3" column="1" > - <widget class="QCheckBox" name="checkBox_4" > - <property name="text" > - <string>Create inde&x</string> - </property> - <property name="checked" > - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> - </layout> - </widget> - <pixmapfunction></pixmapfunction> - <resources/> - <connections/> -</ui> diff --git a/doc/src/snippets/quiloader/mywidget.h b/doc/src/snippets/quiloader/mywidget.h deleted file mode 100644 index b92c6e5a6..000000000 --- a/doc/src/snippets/quiloader/mywidget.h +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MYWIDGET_H -#define MYWIDGET_H - -#include <QWidget> - -class MyWidget : public QWidget -{ -public: - MyWidget(QWidget *parent = 0); -}; - -#endif diff --git a/doc/src/snippets/quiloader/quiloader.pro b/doc/src/snippets/quiloader/quiloader.pro deleted file mode 100644 index 31ddf3256..000000000 --- a/doc/src/snippets/quiloader/quiloader.pro +++ /dev/null @@ -1,4 +0,0 @@ -HEADERS = mywidget.h -SOURCES = main.cpp mywidget.cpp -RESOURCES = mywidget.qrc -QT += uitools |