diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-15 17:21:39 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-15 17:21:39 (GMT) |
| commit | f23bce37a8a3536bfedce7cc2d57f0761b2d1e31 (patch) | |
| tree | e7dd9c7f7724df3f12fe819321e44c63f4eb0c2c /src/gui/widgets/qmainwindowlayout_p.h | |
| parent | f41eac269d354ebeb797b9cb173b09fc996564cf (diff) | |
| parent | b832dffc1eb85181aa2d99afd1a6c764b634091d (diff) | |
| download | Qt-f23bce37a8a3536bfedce7cc2d57f0761b2d1e31.zip Qt-f23bce37a8a3536bfedce7cc2d57f0761b2d1e31.tar.gz Qt-f23bce37a8a3536bfedce7cc2d57f0761b2d1e31.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/widgets/qmainwindowlayout_p.h')
| -rw-r--r-- | src/gui/widgets/qmainwindowlayout_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qmainwindowlayout_p.h b/src/gui/widgets/qmainwindowlayout_p.h index 955693d..e1b981c 100644 --- a/src/gui/widgets/qmainwindowlayout_p.h +++ b/src/gui/widgets/qmainwindowlayout_p.h @@ -159,7 +159,7 @@ class Q_AUTOTEST_EXPORT QMainWindowLayout : public QLayout public: QMainWindowLayoutState layoutState, savedState; - explicit QMainWindowLayout(QMainWindow *mainwindow); + QMainWindowLayout(QMainWindow *mainwindow, QLayout *parentLayout); ~QMainWindowLayout(); QMainWindow::DockOptions dockOptions; |