diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-16 12:38:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-16 20:20:23 +0000 |
| commit | 6274ff9580e757ee50b4bd7a628e202c01d7af9f (patch) | |
| tree | 851a1df1f3dab96fd39d8810db78fc9c45983e53 | |
| parent | 2c7163385f78f3a8f3be0ebbe094791b03f89ef8 (diff) | |
| download | qtwebkit-6274ff9580e757ee50b4bd7a628e202c01d7af9f.tar.gz | |
Fix conflicting forward declarations of NSString
NSString is also declared in QString.h since qtbase/375c5a00
as struct objc_object. Match Qt.
Change-Id: I323719a0831d825e8dc433c34f069da87c9706c4
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | Source/WebCore/platform/mac/WebCoreNSStringExtras.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebCore/platform/mac/WebCoreNSStringExtras.h b/Source/WebCore/platform/mac/WebCoreNSStringExtras.h index a2a0e9316..750fd67d0 100644 --- a/Source/WebCore/platform/mac/WebCoreNSStringExtras.h +++ b/Source/WebCore/platform/mac/WebCoreNSStringExtras.h @@ -32,7 +32,7 @@ #include <Foundation/Foundation.h> @class NSString; #else -typedef struct NSString NSString; +typedef struct objc_object NSString; #endif #ifdef __cplusplus |