Changeset 89037 in webkit


Ignore:
Timestamp:
Jun 16, 2011 9:55:56 AM (13 years ago)
Author:
qi.2.zhang@nokia.com
Message:

2011-06-16 Qi Zhang <qi.2.zhang@nokia.com>

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:
Location:
trunk/Source/JavaScriptCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r88988 r89037  
     12011-06-16  Qi Zhang  <qi.2.zhang@nokia.com>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        [Qt] Fix building with CONFIG(use_system_icu)
     6        https://bugs.webkit.org/show_bug.cgi?id=62744
     7
     8        Do not define WTF_USE_QT4_UNICODE if WTF_USE_ICU_UNICODE is set.
     9
     10        * wtf/Platform.h:
     11
    1122011-06-15  Darin Adler  <darin@apple.com>
    213
  • trunk/Source/JavaScriptCore/wtf/Platform.h

    r88604 r89037  
    601601
    602602#if PLATFORM(QT)
     603#ifndef WTF_USE_ICU_UNICODE
    603604#define WTF_USE_QT4_UNICODE 1
     605#endif
    604606#elif OS(WINCE)
    605607#define WTF_USE_WINCE_UNICODE 1
Note: See TracChangeset for help on using the changeset viewer.