equal
deleted
inserted
replaced
470 } |
470 } |
471 } |
471 } |
472 |
472 |
473 void QMainWindowLayout::cleanUpMacToolbarItems() |
473 void QMainWindowLayout::cleanUpMacToolbarItems() |
474 { |
474 { |
475 for (int i = 0; i < toolbarItemsCopy.size(); ++i) |
475 #ifdef QT_MAC_USE_COCOA |
|
476 QMacCocoaAutoReleasePool pool; |
|
477 #endif |
|
478 for (int i = 0; i < toolbarItemsCopy.size(); ++i) { |
|
479 #ifdef QT_MAC_USE_COCOA |
|
480 NSToolbarItem *item = static_cast<NSToolbarItem *>(toolbarItemsCopy.at(i)); |
|
481 [item setView:0]; |
|
482 #endif |
476 CFRelease(toolbarItemsCopy.at(i)); |
483 CFRelease(toolbarItemsCopy.at(i)); |
|
484 } |
477 toolbarItemsCopy.clear(); |
485 toolbarItemsCopy.clear(); |
478 unifiedToolbarHash.clear(); |
486 unifiedToolbarHash.clear(); |
479 |
487 |
480 #ifdef QT_MAC_USE_COCOA |
488 #ifdef QT_MAC_USE_COCOA |
481 QMacCocoaAutoReleasePool pool; |
|
482 |
|
483 OSWindowRef window = qt_mac_window_for(layoutState.mainWindow); |
489 OSWindowRef window = qt_mac_window_for(layoutState.mainWindow); |
484 NSToolbar *macToolbar = [window toolbar]; |
490 NSToolbar *macToolbar = [window toolbar]; |
485 if (macToolbar) { |
491 if (macToolbar) { |
486 [[macToolbar delegate] release]; |
492 [[macToolbar delegate] release]; |
487 [macToolbar setDelegate:nil]; |
493 [macToolbar setDelegate:nil]; |