diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 16:53:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-02 16:53:25 (GMT) |
| commit | 6b674ae7459cf8a391a10c3b61fee525add35f98 (patch) | |
| tree | 0235c1717d34186fbd534281b8870c341a2978b8 /examples | |
| parent | 8bd714033eeb86fc20da4305a9491c2fb82f4476 (diff) | |
| parent | dfcbab749e51cddbbdec35d58c37814d4d21f30f (diff) | |
| download | Qt-6b674ae7459cf8a391a10c3b61fee525add35f98.zip Qt-6b674ae7459cf8a391a10c3b61fee525add35f98.tar.gz Qt-6b674ae7459cf8a391a10c3b61fee525add35f98.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:
Symbian event dispatcher needs to run all active objects.
Re-applied a fix which get lost during softkey refactoring.
Fixed FEP crash when selected text was replaced with a a new T9 text.
Fix windowflags example
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/windowflags/controllerwindow.cpp | 2 |
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); |