diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-09-25 10:16:01 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-09-25 10:16:01 (GMT) |
| commit | 783ca8d44fd87f842323ad1f9e2fef4a5d0b37ad (patch) | |
| tree | 6d422b03a3d695bd3b70ccebcf5e9c7b36f99688 /tools/designer/src/lib/shared/qdesigner_menubar.cpp | |
| parent | 6d240dd985bc9af5756ff6f494112d677cb8148f (diff) | |
| download | Qt-783ca8d44fd87f842323ad1f9e2fef4a5d0b37ad.zip Qt-783ca8d44fd87f842323ad1f9e2fef4a5d0b37ad.tar.gz Qt-783ca8d44fd87f842323ad1f9e2fef4a5d0b37ad.tar.bz2 | |
Make menu editor work on Mac OS X.
Fix a regression caused by the introduction of the
QMenuBar::nativeMenuBar property (defaulting to true),
which caused it the menu editor to disappear.
Handle QMenuBar::nativeMenuBar it as a fake property,
keeping it set to false for Form Editor.
Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
Diffstat (limited to 'tools/designer/src/lib/shared/qdesigner_menubar.cpp')
| -rw-r--r-- | tools/designer/src/lib/shared/qdesigner_menubar.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/designer/src/lib/shared/qdesigner_menubar.cpp b/tools/designer/src/lib/shared/qdesigner_menubar.cpp index 6d231ca..80c7b53 100644 --- a/tools/designer/src/lib/shared/qdesigner_menubar.cpp +++ b/tools/designer/src/lib/shared/qdesigner_menubar.cpp @@ -104,6 +104,8 @@ QDesignerMenuBar::QDesignerMenuBar(QWidget *parent) : setContextMenuPolicy(Qt::DefaultContextMenu); setAcceptDrops(true); // ### fake + // Fake property: Keep the menu bar editable in the form even if a native menu bar is used. + setNativeMenuBar(false); m_addMenu->setText(tr("Type Here")); addAction(m_addMenu); |