diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-04 07:31:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-04 07:33:14 +0100 |
| commit | 03039979b5a643f9def38a73e19835bb69384202 (patch) | |
| tree | e8a9184d5963128f013247ac64ec768d1cbf6911 /src/corelib/codecs | |
| parent | 9682d217e21a2e88b6de799d79b843bbe0039df1 (diff) | |
| parent | 4dc2bc323c985bdceb27f096dd6c8e7af657bb6b (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Also blacklist tst_QRawFont::unsupportedWritingSystem() and
tst_QGlyphRun::mixedScripts() on windows for now.
Conflicts:
qmake/generators/makefile.cpp
src/corelib/itemmodels/qstringlistmodel.cpp
src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
tests/auto/gui/text/qglyphrun/BLACKLIST
tests/auto/gui/text/qrawfont/BLACKLIST
Task-number: QTBUG-72836
Change-Id: I10fea1493f0ae1a5708e1e48d0a4d7d6b76258b9
Diffstat (limited to 'src/corelib/codecs')
| -rw-r--r-- | src/corelib/codecs/codecs.pri | 3 | ||||
| -rw-r--r-- | src/corelib/codecs/codecs.qdoc | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/corelib/codecs/codecs.pri b/src/corelib/codecs/codecs.pri index f1bbde1d69..5d500ce521 100644 --- a/src/corelib/codecs/codecs.pri +++ b/src/corelib/codecs/codecs.pri @@ -56,8 +56,7 @@ qtConfig(textcodec) { qtConfig(iconv) { HEADERS += codecs/qiconvcodec_p.h SOURCES += codecs/qiconvcodec.cpp - qtConfig(gnu-libiconv): \ - QMAKE_USE_PRIVATE += iconv + QMAKE_USE_PRIVATE += iconv } win32 { diff --git a/src/corelib/codecs/codecs.qdoc b/src/corelib/codecs/codecs.qdoc index 9364b7a989..ec9b8185e2 100644 --- a/src/corelib/codecs/codecs.qdoc +++ b/src/corelib/codecs/codecs.qdoc @@ -276,13 +276,11 @@ TSCII, formally the Tamil Standard Code Information Interchange specification, is a commonly used charset for Tamils. The - official page for the standard is at - \l{http://www.tamil.net/tscii/} + official page for the standard is \l{Information Technology in Tamil} - This codec uses the mapping table found at - \l{http://www.geocities.com/Athens/5180/tsciiset.html}. Tamil uses composed Unicode which might cause some problems if you are using Unicode fonts instead of TSCII fonts. + A Tamil codepage layout can be found on \l {Tamil Script Code}. Most of the code was written by Hans Petter Bieker and is included in Qt with the author's permission and the grateful |