diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-31 09:26:35 +0100 |
| commit | 8e20daae9fee5f3b999daffce0d7156015ee974b (patch) | |
| tree | 7adcc397fd378cbb97c186ddb78c226b61906583 /src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm | |
| parent | 5545e5aa6e265469d278e1fb576a737535784422 (diff) | |
| parent | 694702e09d9b17d91db282784f009178cfb1059b (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
Change-Id: Ia6ab42a6daadbf8abc085c971545904d49ea4b56
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm index 0319d4ca6d..cc18c372a7 100644 --- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm +++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm @@ -122,7 +122,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSColorPanelDelegate); - (void)dealloc { - [self restoreOriginalContentView]; + [mStolenContentView release]; [mColorPanel setDelegate:nil]; [[NSNotificationCenter defaultCenter] removeObserver:self]; |