diff options
| author | Takumi ASAKI <takumi.asaki@nokia.com> | 2011-09-09 12:56:23 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2011-09-09 14:56:11 +0200 |
| commit | 78fd8653914c11b78506fae5d5e77947785f57de (patch) | |
| tree | 06a1260d56aa6a2e5708e3f6a584ce014039c69a /src/plugins/platforms/cocoa/qcocoawindow.mm | |
| parent | 2cca7e0884a45c3a022609b2cb4efd381ee8d5a1 (diff) | |
Clang Build Fix: Cocoa platform plugin
Fix some assignment from const values to non-const without cast.
Move #import to avoid compile error.
Fix type mismatch.
Change-Id: I93ae5cd07827b92a91093df979992616b26b14af
Reviewed-on: http://codereview.qt-project.org/4536
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoawindow.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index ef04fc4238..7e4d4217ef 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -133,7 +133,7 @@ void QCocoaWindow::setVisible(bool visible) void QCocoaWindow::setWindowTitle(const QString &title) { CFStringRef windowTitle = QCFString::toCFStringRef(title); - [m_nsWindow setTitle: reinterpret_cast<const NSString *>(windowTitle)]; + [m_nsWindow setTitle: const_cast<NSString *>(reinterpret_cast<const NSString *>(windowTitle))]; CFRelease(windowTitle); } @@ -325,7 +325,7 @@ QNSWindow * QCocoaWindow::createWindow() // ### crashes // [panel setFloatingPanel:needFloating]; // [panel setWorksWhenModal:worksWhenModal]; - window = panel; + window = static_cast<NSWindow *>(panel); break; } default: |