summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-01 22:02:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-01 22:02:06 (GMT)
commit440d6d764d2b13ab9f70675bc3b15806de63f005 (patch)
tree1e303f2d57ed44be364ebb07ad38b8510b1b5243
parenta433a46e4aa726185272d66069e6d9b7c8ab9cf8 (diff)
parentd6d5c8c1e821659e3b7eddb07644e9777514d4d7 (diff)
downloadQt-440d6d764d2b13ab9f70675bc3b15806de63f005.zip
Qt-440d6d764d2b13ab9f70675bc3b15806de63f005.tar.gz
Qt-440d6d764d2b13ab9f70675bc3b15806de63f005.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix windowflags example
-rw-r--r--examples/widgets/windowflags/controllerwindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/windowflags/controllerwindow.cpp b/examples/widgets/windowflags/controllerwindow.cpp
index a1e5455..fb82b8f 100644
--- a/examples/widgets/windowflags/controllerwindow.cpp
+++ b/examples/widgets/windowflags/controllerwindow.cpp
@@ -149,7 +149,7 @@ void ControllerWindow::createTypeGroupBox()
splashScreenRadioButton = createRadioButton(tr("Splash screen"));
windowRadioButton->setChecked(true);
- QVBoxLayout *layout = new QGridLayout;
+ QGridLayout *layout = new QGridLayout;
layout->addWidget(windowRadioButton, 0, 0);
layout->addWidget(dialogRadioButton, 1, 0);
layout->addWidget(sheetRadioButton, 2, 0);