diff options
| author | Aurélien Gâteau <agateau@kde.org> | 2011-06-14 16:04:26 (GMT) |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dietrich-de@nokia.com> | 2011-06-20 10:28:08 (GMT) |
| commit | 31ff55bbeb84f10e75e997c75a63deda83e62507 (patch) | |
| tree | 58a1a29f1030e8e401f4fcb1d3613ffaedb13203 /src/gui/widgets/qmenubar.cpp | |
| parent | 9aeadca09ab4e27ebf299873f90490d585b4fb7f (diff) | |
| download | Qt-31ff55bbeb84f10e75e997c75a63deda83e62507.zip Qt-31ff55bbeb84f10e75e997c75a63deda83e62507.tar.gz Qt-31ff55bbeb84f10e75e997c75a63deda83e62507.tar.bz2 | |
Introduce menubar plugin system
Merge-request: 1254
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Diffstat (limited to 'src/gui/widgets/qmenubar.cpp')
| -rw-r--r-- | src/gui/widgets/qmenubar.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp index ce95c84..3e5365c 100644 --- a/src/gui/widgets/qmenubar.cpp +++ b/src/gui/widgets/qmenubar.cpp @@ -55,6 +55,9 @@ #include <qtoolbar.h> #include <qtoolbutton.h> #include <qwhatsthis.h> +#ifdef Q_WS_X11 +#include <qpluginloader.h> +#endif #ifndef QT_NO_MENUBAR @@ -761,7 +764,7 @@ void QMenuBarPrivate::init() } #endif #ifdef Q_WS_X11 - platformMenuBar = new QX11MenuBar; + platformMenuBar = qt_guiPlatformMenuBarFactory()->create(); platformMenuBar->init(q); #endif |