diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-29 22:58:27 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-29 22:58:27 (GMT) |
| commit | 1fe08312164a8eef87b3efe9b77452b86224999f (patch) | |
| tree | 65d3147ae69860d9031ffaa86dcdd28f5d5fca21 /examples/widgets/softkeys/softkeys.h | |
| parent | 10b5653ad4f25c6f37d640facf4a5ef01fe25926 (diff) | |
| parent | c2c31f30830a4e1e455a13321dd7bae6ac8b360f (diff) | |
| download | Qt-1fe08312164a8eef87b3efe9b77452b86224999f.zip Qt-1fe08312164a8eef87b3efe9b77452b86224999f.tar.gz Qt-1fe08312164a8eef87b3efe9b77452b86224999f.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'examples/widgets/softkeys/softkeys.h')
| -rw-r--r-- | examples/widgets/softkeys/softkeys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/softkeys/softkeys.h b/examples/widgets/softkeys/softkeys.h index 178ae64..1372fa4 100644 --- a/examples/widgets/softkeys/softkeys.h +++ b/examples/widgets/softkeys/softkeys.h @@ -61,7 +61,7 @@ public: MainWindow(QWidget *parent = 0); ~MainWindow(); private: - QVBoxLayout *layout; + QGridLayout *layout; QWidget *central; QTextEdit* textEditor; QLabel *infoLabel; |