From 6ac37019b952c7d38ee2d04168ef21541f8c15c2 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Fri, 8 Jan 2010 19:28:28 +0100 Subject: Doc: Clarified why a path matches in the example given. Task-number: QT-1519 (internal) Reviewed-by: Trust Me --- doc/src/deployment/qt-conf.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc index 4357c88..b195889 100644 --- a/doc/src/deployment/qt-conf.qdoc +++ b/doc/src/deployment/qt-conf.qdoc @@ -128,7 +128,7 @@ \list \o 4.0.1 matches \c Paths/4 \o 4.1.5 matches \c Paths/4.1 - \o 4.6.3 matches \c Paths/4.2.5 + \o 4.6.3 matches \c Paths/4.2.5 (because 4.2.5 is the latest version with the same major version number) \o 5.0.0 matches \c Paths \o 6.0.2 matches \c Paths/6 \endlist -- cgit v0.12 From bbac0f08d65b54eccadae7629a5eef10da3b3370 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Mon, 11 Jan 2010 14:27:04 +0100 Subject: Doc: Added a missing example to the list of Graphics View examples. Reviewed-by: Trust Me --- examples/graphicsview/graphicsview.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro index 210ab1f..8f65d51 100644 --- a/examples/graphicsview/graphicsview.pro +++ b/examples/graphicsview/graphicsview.pro @@ -10,6 +10,7 @@ SUBDIRS = \ dragdroprobot \ flowlayout \ anchorlayout \ + simpleanchorlayout \ weatheranchorlayout contains(QT_CONFIG, qt3support):SUBDIRS += portedcanvas portedasteroids -- cgit v0.12 From 55305ee1ea58c52928079f83562ba7e680406969 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Tue, 12 Jan 2010 10:25:46 +0100 Subject: Doc: Resized the window and added a title. Reviewed-by: Trust Me --- examples/widgets/validators/validators.ui | 321 +++++++++++++++--------------- 1 file changed, 161 insertions(+), 160 deletions(-) diff --git a/examples/widgets/validators/validators.ui b/examples/widgets/validators/validators.ui index f05b96f..cd984e6 100644 --- a/examples/widgets/validators/validators.ui +++ b/examples/widgets/validators/validators.ui @@ -1,41 +1,42 @@ - + + ValidatorsForm - - + + 0 0 526 - 668 + 443 - - Form + + Validators - - - 9 - - + + 6 + + 9 + - - - 0 - - + + 6 + + 0 + - + - + Qt::Horizontal - + 40 20 @@ -46,84 +47,84 @@ - - + + QIntValidator - - - 9 - - + + 6 + + 9 + - - - 0 - - + + 6 + + 0 + - - + + 0 - + 6 - - - + + + Min: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + + + + 1 0 - + -1000000 - + 1000000 - - - + + + Max: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + + + + 1 0 - + -1000000 - + 1000000 - + 1000 @@ -131,39 +132,39 @@ - - + + QFrame::StyledPanel - + QFrame::Sunken - - - 9 - - + + 6 + + 9 + - - - + + + 0 0 - - :/ledoff.png + + :/ledoff.png - + Qt::AlignCenter - - + + editingFinished() @@ -175,13 +176,13 @@ - + Qt::Vertical - + QSizePolicy::Fixed - + 20 20 @@ -190,134 +191,134 @@ - + - - + + QDoubleValidator - - - 9 - - + + 6 + + 9 + - - - 0 - - + + 6 + + 0 + - - + + 0 - + 6 - - - + + + Min: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + + + + 1 0 - + -100000.000000000000000 - + 100000.000000000000000 - + 0.000000000000000 - - - + + + Format: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + - + Standard - + Scientific - - - + + + Max: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + + + + 1 0 - + -100000.000000000000000 - + 100000.000000000000000 - + 1000.000000000000000 - - - + + + Decimals: - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - + + + 2 @@ -325,36 +326,36 @@ - - + + QFrame::StyledPanel - + QFrame::Sunken - - - 9 - - + + 6 + + 9 + - - + + - - :/ledoff.png + + :/ledoff.png - + Qt::AlignCenter - - + + editingFinished() @@ -366,13 +367,13 @@ - + Qt::Vertical - + QSizePolicy::Fixed - + 20 20 @@ -381,17 +382,17 @@ - + - + Qt::Vertical - + 20 111 @@ -400,19 +401,19 @@ - - - 0 - - + + 6 + + 0 + - + Qt::Horizontal - + 40 20 @@ -421,8 +422,8 @@ - - + + Quit @@ -444,7 +445,7 @@ - + @@ -453,11 +454,11 @@ ValidatorsForm close() - + 94 274 - + 131 260 -- cgit v0.12 From cf32ca450a80d0a9d0be36d74320de651b83ad63 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Wed, 13 Jan 2010 21:07:42 +0100 Subject: Doc: Describe QStackedWidget::removeWidget() more thoroughly. Reviewed-by: Pierre Rossi --- src/gui/widgets/qstackedwidget.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/widgets/qstackedwidget.cpp b/src/gui/widgets/qstackedwidget.cpp index 396e233..2509a21 100644 --- a/src/gui/widgets/qstackedwidget.cpp +++ b/src/gui/widgets/qstackedwidget.cpp @@ -186,8 +186,11 @@ int QStackedWidget::insertWidget(int index, QWidget *widget) } /*! - Removes the given \a widget from the QStackedWidget. The widget - is \e not deleted. + Removes the given \a widget from the QStackedWidget. + + \bold{Note:} The ownership of \a widget remains the same. + The widget is \e not deleted, but simply removed from the widget's + stacked layout, causing it to be hidden. \sa addWidget(), insertWidget(), currentWidget() */ -- cgit v0.12