diff options
Diffstat (limited to 'src/gui/widgets/qmainwindowlayout_mac.mm')
| -rw-r--r-- | src/gui/widgets/qmainwindowlayout_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm index c2c90f0..a6b0a03 100644 --- a/src/gui/widgets/qmainwindowlayout_mac.mm +++ b/src/gui/widgets/qmainwindowlayout_mac.mm @@ -48,6 +48,7 @@ #ifndef QT_MAC_USE_COCOA #include <Carbon/Carbon.h> #else +#include <quuid.h> #include <private/qcocoatoolbardelegate_mac_p.h> #import <private/qcocoawindowdelegate_mac_p.h> #endif @@ -444,7 +445,7 @@ void QMainWindowLayout::insertIntoMacToolbar(QToolBar *before, QToolBar *toolbar QMacCocoaAutoReleasePool pool; NSToolbar *macToolbar = [window toolbar]; if (macToolbar == nil) { - macToolbar = [[NSToolbar alloc] initWithIdentifier:(NSString *)kQMainWindowMacToolbarID]; + macToolbar = [[NSToolbar alloc] initWithIdentifier:qt_mac_QStringToNSString(QUuid::createUuid().toString())]; [macToolbar setDisplayMode:NSToolbarDisplayModeIconOnly]; [macToolbar setSizeMode:NSToolbarSizeModeRegular]; [macToolbar setDelegate:[[QT_MANGLE_NAMESPACE(QCocoaToolBarDelegate) alloc] initWithMainWindowLayout:this]]; |