Title: [89037] trunk/Source/_javascript_Core
- Revision
- 89037
- Author
- [email protected]
- Date
- 2011-06-16 09:55:56 -0700 (Thu, 16 Jun 2011)
Log Message
2011-06-16 Qi Zhang <[email protected]>
Reviewed by Laszlo Gombos.
[Qt] Fix building with CONFIG(use_system_icu)
https://bugs.webkit.org/show_bug.cgi?id=62744
Do not define WTF_USE_QT4_UNICODE if WTF_USE_ICU_UNICODE is set.
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (89036 => 89037)
--- trunk/Source/_javascript_Core/ChangeLog 2011-06-16 16:53:03 UTC (rev 89036)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-06-16 16:55:56 UTC (rev 89037)
@@ -1,3 +1,14 @@
+2011-06-16 Qi Zhang <[email protected]>
+
+ Reviewed by Laszlo Gombos.
+
+ [Qt] Fix building with CONFIG(use_system_icu)
+ https://bugs.webkit.org/show_bug.cgi?id=62744
+
+ Do not define WTF_USE_QT4_UNICODE if WTF_USE_ICU_UNICODE is set.
+
+ * wtf/Platform.h:
+
2011-06-15 Darin Adler <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Source/_javascript_Core/wtf/Platform.h (89036 => 89037)
--- trunk/Source/_javascript_Core/wtf/Platform.h 2011-06-16 16:53:03 UTC (rev 89036)
+++ trunk/Source/_javascript_Core/wtf/Platform.h 2011-06-16 16:55:56 UTC (rev 89037)
@@ -600,7 +600,9 @@
#endif /* OS(WINCE) && !PLATFORM(QT) */
#if PLATFORM(QT)
+#ifndef WTF_USE_ICU_UNICODE
#define WTF_USE_QT4_UNICODE 1
+#endif
#elif OS(WINCE)
#define WTF_USE_WINCE_UNICODE 1
#elif PLATFORM(BREWMP)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
