diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-08-02 21:44:15 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-04 13:24:48 (GMT) |
| commit | b100e49d76232080d782bc7e1e77c29a30c9d710 (patch) | |
| tree | 55491125609bc2f38814dde207b496ee290502ee /src/gui | |
| parent | 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf (diff) | |
| download | Qt-b100e49d76232080d782bc7e1e77c29a30c9d710.zip Qt-b100e49d76232080d782bc7e1e77c29a30c9d710.tar.gz Qt-b100e49d76232080d782bc7e1e77c29a30c9d710.tar.bz2 | |
Fix build regression caused by 7b7c321d5f35b6ee70db5a72d5d37e19e125d7cf.
Change-Id: I54f4e0ca2ca677a41c22183263931c9d65896168
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qapplication_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index e50e7b5..14116c7 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -247,7 +247,7 @@ void qt_mac_loadMenuNib(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader) QFile::copy(file.absoluteFilePath(), nibDir + QLatin1String("/") + file.fileName()); // Load and instantiate nib file from temp - NSURL *nibUrl = [NSURL fileURLWithPath : reinterpret_cast<const NSString *>(QCFString::toCFStringRef(nibDir))]; + NSURL *nibUrl = [NSURL fileURLWithPath : const_cast<NSString *>(reinterpret_cast<const NSString *>(QCFString::toCFStringRef(nibDir)))]; NSNib *nib = [[NSNib alloc] initWithContentsOfURL : nibUrl]; [nib autorelease]; if (!nib) { |