summaryrefslogtreecommitdiffstats
path: root/tools/designer
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-05-13 11:58:08 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-05-13 11:58:08 (GMT)
commit0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9 (patch)
tree046ad0fdf693107efb75a0ecd03f6cbc3dd00680 /tools/designer
parentc2c69c117407990e5c2d8900f4aa27979273084a (diff)
parenta18ebd2a70e83863bc9a8cc64a65791a6d879f02 (diff)
downloadQt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.zip
Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.tar.gz
Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.tar.bz2
Merge branch '4.5'
Conflicts: tests/auto/qgraphicsview/tst_qgraphicsview.cpp
Diffstat (limited to 'tools/designer')
-rw-r--r--tools/designer/src/uitools/quiloader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/designer/src/uitools/quiloader.cpp b/tools/designer/src/uitools/quiloader.cpp
index 548f07e..2a66095 100644
--- a/tools/designer/src/uitools/quiloader.cpp
+++ b/tools/designer/src/uitools/quiloader.cpp
@@ -572,9 +572,9 @@ void QUiLoaderPrivate::setupWidgetMap() const
\class QUiLoader
\inmodule QtUiTools
- \brief enables standalone applications to dynamically create user
- interfaces at run-time using the information stored in .ui files or
- specified in plugin paths.
+ \brief The QUiLoader class enables standalone applications to
+ dynamically create user interfaces at run-time using the
+ information stored in .ui files or specified in plugin paths.
In addition, you can customize or create your own user interface by
deriving your own loader class.