projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7b72690
)
Mac: Fix compilation with -qtnamespace
author
Kai Koehne
<kai.koehne@nokia.com>
Wed, 8 Feb 2012 08:59:02 +0000
(09:59 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Wed, 8 Feb 2012 13:43:18 +0000
(14:43 +0100)
Change-Id: I85559b6698103eef865464a355d9b00012dcbd5f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/corelib/kernel/qcore_mac_objc.mm
patch
|
blob
|
history
diff --git
a/src/corelib/kernel/qcore_mac_objc.mm
b/src/corelib/kernel/qcore_mac_objc.mm
index
76705f1
..
35e3bb2
100644
(file)
--- a/
src/corelib/kernel/qcore_mac_objc.mm
+++ b/
src/corelib/kernel/qcore_mac_objc.mm
@@
-41,6
+41,8
@@
#include <private/qcore_mac_p.h>
+QT_BEGIN_NAMESPACE
+
NSString *QCFString::toNSString(const QString &string)
{
// The const cast below is safe: CfStringRef is immutable and so is NSString.
@@
-52,3
+54,5
@@
QString QCFString::toQString(const NSString *nsstr)
return toQString(reinterpret_cast<CFStringRef>(nsstr));
}
+QT_END_NAMESPACE
+