diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 09:36:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 09:36:18 (GMT) |
| commit | 8bbb28f2d5f6a53f94f23f3ac86f5270143795ab (patch) | |
| tree | 813c9d5e20af13d6f58d19262c31ee6fd475608c /examples/widgets/windowflags | |
| parent | 901bee3cbad3fcf52465d72cd257b4dd87e5b049 (diff) | |
| parent | 3d50a8049b20e01b8a2cb9b954b14302dc6144c6 (diff) | |
| download | Qt-8bbb28f2d5f6a53f94f23f3ac86f5270143795ab.zip Qt-8bbb28f2d5f6a53f94f23f3ac86f5270143795ab.tar.gz Qt-8bbb28f2d5f6a53f94f23f3ac86f5270143795ab.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:
Added .condition modifier to SUBDIRS.
Added orientation change support for show/showNormal widgets in S60.
Added fullscreen support to softkeys in Symbian.
Diffstat (limited to 'examples/widgets/windowflags')
| -rw-r--r-- | examples/widgets/windowflags/controllerwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/windowflags/controllerwindow.cpp b/examples/widgets/windowflags/controllerwindow.cpp index 0277794..a1e5455 100644 --- a/examples/widgets/windowflags/controllerwindow.cpp +++ b/examples/widgets/windowflags/controllerwindow.cpp @@ -58,7 +58,7 @@ ControllerWindow::ControllerWindow() bottomLayout->addStretch(); bottomLayout->addWidget(quitButton); - QVBoxLayout *mainLayout = new QVBoxLayout; + QHBoxLayout *mainLayout = new QHBoxLayout; mainLayout->addWidget(typeGroupBox); mainLayout->addWidget(hintsGroupBox); mainLayout->addLayout(bottomLayout); @@ -149,7 +149,7 @@ void ControllerWindow::createTypeGroupBox() splashScreenRadioButton = createRadioButton(tr("Splash screen")); windowRadioButton->setChecked(true); - QGridLayout *layout = new QGridLayout; + QVBoxLayout *layout = new QGridLayout; layout->addWidget(windowRadioButton, 0, 0); layout->addWidget(dialogRadioButton, 1, 0); layout->addWidget(sheetRadioButton, 2, 0); |