diff options
author | Yann Bodson <yann.bodson@nokia.com> | 2011-03-29 04:17:51 (GMT) |
---|---|---|
committer | Yann Bodson <yann.bodson@nokia.com> | 2011-03-29 04:17:51 (GMT) |
commit | 66a1938f34c9b50902e6c88b45fc063abb49830b (patch) | |
tree | ea79a39b9076a207fc0ca0508a907d95eb29b3d6 /src/gui/widgets/qmainwindowlayout.cpp | |
parent | 6567653a003191508ee5561dcd9896cb97cf3ec3 (diff) | |
parent | 4da2ba2e788bb63a155e1d10ae559d4366eed875 (diff) | |
download | Qt-66a1938f34c9b50902e6c88b45fc063abb49830b.zip Qt-66a1938f34c9b50902e6c88b45fc063abb49830b.tar.gz Qt-66a1938f34c9b50902e6c88b45fc063abb49830b.tar.bz2 |
Merge ../qt-qml-staging
Diffstat (limited to 'src/gui/widgets/qmainwindowlayout.cpp')
-rw-r--r-- | src/gui/widgets/qmainwindowlayout.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/widgets/qmainwindowlayout.cpp b/src/gui/widgets/qmainwindowlayout.cpp index 6bc07e1..d4afe07 100644 --- a/src/gui/widgets/qmainwindowlayout.cpp +++ b/src/gui/widgets/qmainwindowlayout.cpp @@ -73,6 +73,10 @@ # include <private/qt_cocoa_helpers_mac_p.h> #endif +#ifdef QT_NO_DOCKWIDGET +extern QMainWindowLayout *qt_mainwindow_layout(const QMainWindow *window); +#endif + #ifdef Q_DEBUG_MAINWINDOW_LAYOUT # include <QTextStream> #endif |