Changeset 88016 in webkit
- Timestamp:
- Jun 3, 2011 7:47:04 AM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 added
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r88006 r88016 1 2011-06-03 Siddharth Mathur <siddharth.mathur@nokia.com> 2 3 Reviewed by Benjamin Poulain. 4 5 [Qt] Build flag for experimental ICU library support 6 https://bugs.webkit.org/show_bug.cgi?id=60786 7 8 Adds a build-time flag (CONFIG+=use_system_icu) that enables experimental 9 ICU powered Unicode support. 10 11 * JavaScriptCore.pri: Support for use_system_icu CONFIG flag. 12 * wtf/unicode/qt4/UnicodeQt4.h: Guard an include file with USE(ICU_UNICODE). 13 1 14 2011-06-03 Alexis Menard <alexis.menard@openbossa.org> 2 15 -
trunk/Source/JavaScriptCore/JavaScriptCore.pri
r84364 r88016 58 58 DEFINES += BUILDING_JavaScriptCore BUILDING_WTF 59 59 60 # CONFIG += text_breaking_with_icu 61 62 contains (CONFIG, text_breaking_with_icu) { 63 DEFINES += WTF_USE_QT_ICU_TEXT_BREAKING=1 60 contains(CONFIG, use_system_icu) { 61 DEFINES += WTF_USE_ICU_UNICODE=1 62 DEFINES -= WTF_USE_QT4_UNICODE 63 LIBS += -licuuc -licui18n 64 } else { 65 DEFINES += WTF_USE_QT4_UNICODE=1 66 DEFINES -= WTF_USE_ICU_UNICODE 64 67 } 65 68 -
trunk/Source/JavaScriptCore/wtf/unicode/qt4/UnicodeQt4.h
r69773 r88016 32 32 33 33 #include <stdint.h> 34 #if USE( QT_ICU_TEXT_BREAKING)34 #if USE(ICU_UNICODE) 35 35 #include <unicode/ubrk.h> 36 36 #endif … … 68 68 #endif 69 69 70 #if !USE( QT_ICU_TEXT_BREAKING)70 #if !USE(ICU_UNICODE) 71 71 typedef uint32_t UChar32; 72 72 #endif -
trunk/Source/WebCore/ChangeLog
r88011 r88016 1 2011-06-03 Siddharth Mathur <siddharth.mathur@nokia.com> 2 3 Reviewed by Benjamin Poulain. 4 5 [Qt] Build flag for experimental ICU library support 6 https://bugs.webkit.org/show_bug.cgi?id=60786 7 8 Adds a build-time flag (CONFIG+=use_system_icu) that enables experimental 9 ICU powered Unicode support. 10 11 No new tests as no new features added. 12 13 * WebCore.pri: Removed text_breaking_with_icu CONFIG flag. 14 * WebCore.pro: Added TextCodecICU.cpp and qt/TextBreakIteratorInternalICUQt.cpp. 15 * editing/qt/SmartReplaceQt.cpp: 16 * features.pri: Support for use_system_icu CONFIG flag. 17 * platform/text/TextCodecICU.cpp: Guard with USE(ICU_UNICODE). 18 * platform/text/qt/TextBreakIteratorInternalICUQt.cpp: Added. 19 (WebCore::Q_GLOBAL_STATIC_WITH_INITIALIZER): 20 (WebCore::currentSearchLocaleID): 21 (WebCore::currentTextBreakLocaleID): 22 * platform/text/qt/TextBreakIteratorQt.cpp: Moved out currentTextBreakLocaleID(). 23 (WebCore::isTextBreak): 24 * platform/text/qt/TextCodecQt.cpp: Guard with USE(QT4_UNICODE). 25 (WebCore::TextCodecQt::registerEncodingNames): 26 (WebCore::TextCodecQt::registerCodecs): 27 1 28 2011-06-03 Yael Aharon <yael.aharon@nokia.com> 2 29 -
trunk/Source/WebCore/WebCore.pri
r87905 r88016 296 296 } 297 297 298 contains (CONFIG, text_breaking_with_icu) {299 LIBS += -licuuc300 }301 302 298 !CONFIG(QTDIR_build) { 303 299 win32-*|wince* { -
trunk/Source/WebCore/WebCore.pro
r87961 r88016 1064 1064 platform/text/TextCodecUTF16.cpp \ 1065 1065 platform/text/TextCodecUTF8.cpp \ 1066 platform/text/TextCodecICU.cpp \ 1066 1067 platform/text/TextEncoding.cpp \ 1067 1068 platform/text/TextEncodingDetectorNone.cpp \ … … 2555 2556 platform/text/qt/TextBoundariesQt.cpp \ 2556 2557 platform/text/qt/TextBreakIteratorQt.cpp \ 2558 platform/text/qt/TextBreakIteratorInternalICUQt.cpp \ 2557 2559 platform/text/qt/TextCodecQt.cpp \ 2558 2560 platform/qt/WheelEventQt.cpp \ … … 2586 2588 } 2587 2589 2588 contains (CONFIG, text_breaking_with_icu) {2590 contains (CONFIG, use_system_icu) { 2589 2591 SOURCES += platform/text/TextBreakIteratorICU.cpp 2590 2592 } -
trunk/Source/WebCore/editing/qt/SmartReplaceQt.cpp
r83029 r88016 29 29 30 30 #include "config.h" 31 #if USE(QT4_UNICODE) 31 32 #include "SmartReplace.h" 33 #include <QChar> 32 34 33 35 namespace WebCore { … … 65 67 66 68 } 69 #endif -
trunk/Source/WebCore/features.pri
r87312 r88016 27 27 SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/ 28 28 } 29 } 30 31 contains(CONFIG, use_system_icu) { 32 DEFINES += WTF_USE_ICU_UNICODE=1 33 DEFINES -= WTF_USE_QT4_UNICODE 34 LIBS += -licuuc -licui18n 35 } else { 36 DEFINES += WTF_USE_QT4_UNICODE=1 37 DEFINES -= WTF_USE_ICU_UNICODE 29 38 } 30 39 -
trunk/Source/WebCore/platform/text/TextCodecICU.cpp
r84473 r88016 26 26 27 27 #include "config.h" 28 #if USE(ICU_UNICODE) 28 29 #include "TextCodecICU.h" 29 30 … … 472 473 473 474 } // namespace WebCore 475 #endif 476 -
trunk/Source/WebCore/platform/text/qt/TextBreakIteratorQt.cpp
r81302 r88016 37 37 namespace WebCore { 38 38 39 #if USE(QT_ICU_TEXT_BREAKING)40 const char* currentTextBreakLocaleID()41 {42 return QLocale::system().name().toLatin1();43 }44 #else45 39 class TextBreakIterator : public QTextBoundaryFinder { 46 40 public: … … 156 150 return true; 157 151 } 158 #endif159 152 160 153 } -
trunk/Source/WebCore/platform/text/qt/TextCodecQt.cpp
r86531 r88016 26 26 27 27 #include "config.h" 28 #if USE(QT4_UNICODE) 28 29 #include "TextCodecQt.h" 29 30 #include "PlatformString.h" … … 47 48 { 48 49 QList<int> mibs = QTextCodec::availableMibs(); 49 // qDebug() << ">>>>>>>>> registerEncodingNames";50 50 51 51 for (int i = 0; i < mibs.size(); ++i) { … … 53 53 const char *name = getAtomicName(c->name()); 54 54 registrar(name, name); 55 // qDebug() << " " << name << name;56 55 QList<QByteArray> aliases = c->aliases(); 57 56 for (int i = 0; i < aliases.size(); ++i) { 58 57 const char *a = getAtomicName(aliases.at(i)); 59 // qDebug() << " (a) " << a << name;60 58 registrar(a, name); 61 59 } … … 71 69 { 72 70 QList<int> mibs = QTextCodec::availableMibs(); 73 // qDebug() << ">>>>>>>>> registerCodecs";74 71 75 72 for (int i = 0; i < mibs.size(); ++i) { 76 73 QTextCodec *c = QTextCodec::codecForMib(mibs.at(i)); 77 74 const char *name = getAtomicName(c->name()); 78 // qDebug() << " " << name;79 75 registrar(name, newTextCodecQt, 0); 80 76 } … … 165 161 166 162 } // namespace WebCore 163 #endif
Note: See TracChangeset
for help on using the changeset viewer.