| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
amplitude, and period. Fix for QTBUG-7940.
(cherry picked from commit 11f8bbaff73811c8d3342600bc7c77f47c34c7de)
|
|
|
|
|
|
| |
QTBUG-11938 and QTBUG-10801
(cherry picked from commit 5bdb85e3b21bcf624eb1830aa32d027e0c6870fe)
|
|
|
|
|
|
| |
Task-number: QTBUG-12063
Reviewed-by: trustme
(cherry picked from commit 70ffe96013dcf7b4be11d1fbe850b9bbcf37c741)
|
|
|
|
|
|
|
|
|
| |
8601-2004 standard.
Task-number: QTBUG-11623
Reviewed-by: Denis Dzyubenko
Reviewed-by: David Boddie
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Consolidate zlib configuration redundancy
Fixed whitespace formatting
Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
Split image handler plugin project files
No explicit link to zlib/jpeg for system mng/tiff
Removed stray line continuations
Long live else!
qdoc: Added a solution for creating tables of contents for manuals.
Doc: Fixed markup.
Fixed size hint for combo box on windows
|
| |
| |
| |
| |
| | |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|/
|
|
|
|
|
|
| |
parsing failed.
It's relevant with QTBUG-11623, but not a fix for it.
Reviewed-by: Aleksandar Sasha Babic
|
|
|
|
|
| |
Reviewed-by: Thomas Zander
Task-number: QTBUG-8370
|
|
|
|
|
| |
Merge-request: 718
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageDecoderQt.cpp
src/corelib/global/qglobal.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix issues with thai line breaking
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge latest harfbuzz:
commit cce760d41f115fecd5b9b6b20b62883b10a9c204
Author: Lars Knoll <lars.knoll@nokia.com>
Date: Mon Jun 14 14:14:59 2010 +0200
Fixes for thai linebreaking
* Load libthai.so.0 since libthai.so is not there on all systems
* Remove dependency on codecs. Unicode->TIS620 is so simple we can
simply hardcode it in harbuzz-thai.c
* Speed up detection of word boundaries
* Falback when libthai is not found is now to not break instead of
breaking after every character (in line with recommendations from
unicode.org linebreaking algorithm)
Reviewed-by: Simon Hausmann
Adapt qharfbuzz.cpp to the changes in harfbuzz.
Reviewed-by: Simon Hausmann
|
| |\ \ \ |
|
| |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
src/3rdparty/webkit merged with checkout --ours
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/platform/text/qt/TextBreakIteratorQt.cpp
src/gui/kernel/qt_s60_p.h
src/gui/text/qfontdatabase_s60.cpp
src/script/api/qscriptengine.cpp
|
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QTextBoundaryFinder was not consistent with ICU.
See also:
https://bugs.webkit.org/show_bug.cgi?id=31076
The previous definition of a line break was that the index
in the string after which the line break should occur.
Now it is the index of the boundary at which the break should
occur (hence one more).
Task-number: QT-3495
Reviewed-by: Simon Hausmann
Reviewed-by: Lars Knoll
|
| |_|/
|/| |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix to use the native CompareC function instead.
Task-number: QTBUG-11350
Reviewed-by: Miikka Heikkinen
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (55 commits)
Fix symbian-abld build failure with bearer plugins
remove certificate bundle
make QSslSocket::systemCaCertificates() use system certs
Adjusted RegExp in QSslCertificate::fromPath()
Fix QSystemTrayIcon::supportsMessages() on Windows
Use NIM_SETVERSION to get the latest behavior
Cleanup obsolete stuff
doc: Added DITA XML generator
Fixed a broken merge.
Changed the way we detect touch screen on Windows.
Fixed error deploying qsymbianbearer.qtplugin on Symbian.
Revert "Attempt to fix build failure on Symbian."
Attempt to fix build failure on Symbian.
Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else"
Updated leading whitespace to make indentation more consistent
Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms.
make postgresql support sensitive to PSQL_LIBS
support for cross building Qt for MinGW (win32-g++) on Unix
use "win32-g++*" scope to match all MinGW makespecs
Demos: Fix compilation with namespace.
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
configuration option on Windows and Symbian platforms.
Improved support of "-system-jpeg" "-system-mng" "-system-png" and "-system-tiff" configuration options on Windows (thanks to Mark Brand <mabrand@mabrand.nl>)
Merge-request: 2411
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
This is more in line with the rest of Qt.
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This helps us keeping the code in the key mappers
that detect keyboard changes simple and is useful
for other cases as well.
Task-number: Part of QT-3292
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Rules P2 and P3 demand us to ignore the LRE/LRO/RLE/RLO
characters for determining the paragraph direction.
Task-Number: Part of QT-3292
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QVarLenghtArray: Add typedefs for stl compatibility.
prefer QElapsedTimer over QTime
Allow to build Qt in static with mingw
Protected call to glXChooseFBConfig with appropriate defines.
Use the new OpenGL 3.* context/profile if asked with X11/GLX.
Splitted attrib_list generation into buildSpec from QGLContext::tryVisual.
Fix QTransform::map(const QPainterPath &) not working with paths that
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 599
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/painting/qpainter.cpp
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/eabi/QtNetworku.def
src/s60installs/eabi/QtOpenVGu.def
tests/auto/qfontmetrics/tst_qfontmetrics.cpp
tools/linguist/lupdate/main.cpp
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
test QMultiMap::operator+= and QMultiHash::operator+=
QMultiMap/QMultiHash: must qualify identifier to find this declaration in dependent base class
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
dependent base class
This is required as some compiler such as clang or rvct
respect the standard more than gcc
Reviewed-by: thiago
Reviewed-by: hjk
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We have support for ELangIndonesian, but we also need to support new
ELangIndonesian_Apac which has appeared in Symbian^3.
Task-number: QT-3369
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Last commits added Norwegian Nynorsk and Korean locales support, however the
array that contains the mapping between symbian locale constant and locale
string should be sorted to work.
Task-number: QT-3368
Task-number: QT-3370
Reviewed-by: trustme
|
| |/
| |
| |
| |
| |
| | |
Task-number: QT-3368
Task-number: QT-3370
Reviewed-by: Thiago Macieira
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix compilation: disable -no-feature-* for bootstrapped
QString: Fix severals bugs when comparing with QStringRef
QProgressBar: make accessors const.
Changes: add patch for artificial emboldening
Added static version of QGLFramebufferObject::release().
Fix compilation on WinXP MinGW32;
Add a new qconfig feature GESTURES
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the internal ucstricmp and ucstrcmp contains different bugs if the
strings are not 0-terminated, as it is with QStringRef.
- in ucstricmp, even if the pointer are the same, the lenght could
be different
- we used to deference the 'end' pointer, that would be 0 if the
string ends with 0, but we cannot do that in the general case
Task-number: QTBUG-10404
Reviewed-by: Denis
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
setRawData() itself (consistently with fromRawData()) sets alloc to the
passed raw size, so the check at the start would always find that we
cannot re-use the qstring object, thus completely defeating the purpose
of the function.
so also check that the string data pointer actually points into the
internal array before giving up.
Reviewed-by: olivier
|
|/ / |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
Added some changes for 4.6.3
Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
Allow auto-test to compile when using namespaces
Fix regression in QVarLengthArray::operator=
Removed unnecessary PlatSec capabilities from spectrum demo DLL
Make test work with shadow builds again.
Added missing PlatSec capabilities to spectrum demo DLL
My 4.6.3 changes
Tidy changes file for 4.6.3.
My 4.6.3 changes
My 4.6.3 changes
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Build fix for spectrum demo when -qtnamespace is used
Fixed license headers in spectrum demo
Qt app draws background incorrectly when animated wallpaper is used
Don't use QAtomicInt in statics because they are non-POD.
QTBUG-5955: Qt fails to build on alpha architecture
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/spectrum/app/engine.h
demos/spectrum/app/mainwidget.h
demos/spectrum/app/settingsdialog.h
demos/spectrum/app/spectrograph.h
demos/spectrum/app/spectrumanalyser.h
demos/spectrum/app/tonegenerator.h
demos/spectrum/app/tonegeneratordialog.h
demos/spectrum/app/utils.h
demos/spectrum/app/waveform.h
tests/auto/qtextcodec/tst_qtextcodec.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There was a serious regression wherei, under certain conditions,
assignment would be treated as an append. This was due to poor tracking
of container invariants inside realloc.
From now on, after the allocation decision, s shall contain the number
of elements in the array to be kept. Deleting extra elements in the old
array needn't update this value. Instead, it needs to be updated once
and if new elements are created afterwards.
Auto-test greatly expanded to avoid future embarassments.
Task-number: QTBUG-10978
Reviewed-by: Olivier Goffart
Reviewed-by: Fabien Freling
Olivier reviewed the patch, Fabien the auto-test.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Map Latin American Spanish to es_MX - Spanish in Mexica - the locale data for
those two locales are the same, so it should be more or less safe. The proper
solution is to add support for es-419_419 and es_419 locales to QLocale.
Task-number: QT-3312
Reviewed-by: trustme
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
We have support for ELangIndonesian, but we also need to support new
ELangIndonesian_Apac which has appeared in Symbian^3.
Task-number: QT-3369
Reviewed-by: trustme
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Last commits added Norwegian Nynorsk and Korean locales support, however the
array that contains the mapping between symbian locale constant and locale
string should be sorted to work.
Task-number: QT-3368
Task-number: QT-3370
Reviewed-by: trustme
|
|\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/styles/qmacstyle_mac.mm
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
by inlining & merging QChar::combiningClass() and QChar::unicodeVersion()
Merge-request: 2393
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
where string ends with sequence like HiS, LowS, NotS.
in this case, if combiningClass(HiS, LowS) > combiningClass(NotS),
then result will be invalid due to early exit on (p2 >= s.length()-1)
Merge-request: 2393
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
this also fixes handling of codepoint 0x10000 ("ucs4 > 0x10000" s/>/>=/)
Merge-request: 2393
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
if normalization was requested for QChar::Unicode_Unassigned version;
treat it like latest supported version instead
Merge-request: 2393
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | |
| | |
| | |
| | |
| | | |
Merge-request: 2393
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
|/ /
| |
| |
| | |
Reviewed-by: Olivier Goffart
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-9370
Reviewed-by: trustme
|