| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
even if the local specify QLocale::OmitGroupSeparator
Task-number: QTBUG-9281
Reviewed-by: Denis
(cherry picked from commit 720f4ca0ec3b42a101ac24b2cf74cdc87d29eac9)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
We used to delete the tracked object before the new tracking was
properly set up in QSharedPointer. That means if the tracked object's
destructor or deletion function recursed into the QSharedPointer, it
would find itself in an inconsistent state.
So instead finish the setup and only then call out to user code. That
ensures the internal state is always valid.
Task-number: QTBUG-11730
Reviewed-by: ossi
(cherry picked from commit 943d63e45ad09f75daa7d2f3dcc17bb28fda1766)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
(cherry picked from commit cd003bfcf9a05967893099e8948ba3d8f281aa7d)
|
|
|
|
|
| |
Reviewed-by: Peter Hartmann
(cherry picked from commit dd6c5cad88a56fb3a342fe9d4fc3b113ffe3fd53)
|
|
|
|
|
|
|
|
|
|
| |
Instead, we were returning 0, even if this index did not belong to the
match.
Task-number: QTBUG-7049
Reviewed-by: Volker Hilsheimer
Reviewed-by: Olivier Goffart
(cherry picked from commit dadb99ea2c59d7d0f7a83134b7df5aaaaf80a995)
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| | |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Also fixed a typo in the QScopedPointer docs.
Task-number: QTBUG-10301
Reviewed-by: Kim
|
| |
|
|
|
|
|
| |
Merge-request: 544
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|
|
|
| |
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The constructor of complex type that are declared as Movable (such
as many of our containers) were not being called.
The raison is that the 's' was set to 'asize' right after the qMemCopy
So we need to reset 's' to old size in the movable case (in all cases)
In the static case, 's' has already be incremented to osize
The 's = asize;' can be removed as it is anyway done at the very end of
the function
Task-number: QTBUG-6718
Reviewed-by: Harald Fernengel
|
|
|
|
|
|
|
|
| |
And start is out of bounds.
Reviewed-by: Thiago
Reviewed-by: Joao
Task-number: QTBUG-4306
|
|
|
|
| |
Reviewed-by: David Boddie
|
|
|
|
| |
Task: QTBUG-7766
|
|
|
|
|
|
|
| |
Virtual functions should not be used with copyable types due to
slicing.
This reverts commit c1db6c2c5a3bbe96a628207af169a032d535426f.
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
| |
Reviewed-By: Bradley T. Hughes
|
|
|
|
| |
Reviewed-by: Peter Hartmann
|
|
|
|
| |
Reviewed-by: hjk
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Adjust rw base address for gui built with GCCE for Symbian OS
Added descriptions of translatable strings for Phonon MMF reverb effect
Corrected namespace for Phonon::MMF translatable error strings
Compile fix for non-Symbian compilers
S60 softkey refactoring (support for merging, priorities and menus)
Daylight savings time for Symbian take 2
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
this is a public function, so changing its semantics is no option. in
fact, it broke qmake on windows (for symbian-abld and wince50smart).
Reviewed-by: joerg
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly pointless when converting internal data
structures which are raw utf16 in host byte order anyway. so replace
it with QString::fromRawData() (for short-lived strings) or
QString(const QChar *, int) (otherwise) if possible.
Reviewed-by: axis
Reviewed-by: mariusSO
Reviewed-by: Bill King
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
on any modern architecture, an 1 out of 16 times needlessly executed
shift (even if a long one) and xor are less expensive than a pretty much
randomly 1 out of 16 times differently taken conditional jump. so simply
remove the conditional. ~15% faster on Core2.
Reviewed-by: joao
|
| |/
|/|
| |
| | |
This reverts commit 7bc18035816a2eac15dfac4d987eb9bf43f90ef6.
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Task-number: QTBUG-7418
|
| |
| |
| |
| | |
Task-number: QTBUG-7626
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Task-number: 6666
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
tst_QByteArray is was crashing on linux 64bit.
The memory was freed twice, once by qRealloc, and one by QScopePointer::reset
This patch will leak if qRealloc fails because of OutOfMemory.
But we do not care as it is a corner case.
Reviewed-by: Harald Fernengel
Reviewed-by: Robert Griebl
|
| |
| |
| |
| | |
Task-number: QTBUG-7246
|
| |
| |
| |
| | |
Task-number: QTBUG-5121
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Second try to make this work for all S60 platforms
|
| |
| |
| |
| |
| |
| | |
Reverted due to buildbreak on 3.2 ARMV5 Urel.
This reverts commit 2a20705f874ddad55282f22fabfe30927729ae50.
|
|\ \
| |/ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We already convert date/time format inside the getMacDateFormat, so no reason
to do it again later.
Reviewed-by: Prasanth
|
| | |
| | |
| | |
| | |
| | |
| | | |
Revert a change that is not yet complete and was pushed by mistake.
This reverts commit 44f7c1e097582a704a06ccbbf516536b88ddcd3a.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Subscribing to the locale change notification to be able to update the
system locale whenever the user changes the current system locale.
Also changed the initialization of the system locale to make construction of
the QLocale object as lightweight as possible. So now the default contructor
just creates a QLocale and QSystemLocale objects, but doesn't try to fill the
cache in the latter with data from the system and postpones it until it is
actually requested (most applications create QLocale objects on the stack and
might not even use the data from the system locale, so we don't need to
initialize system locale right away).
Modified-by: axis
Modified-by: Denis Dzyubenko
Reviewed-by: Denis Dzyubenko
Reviewed-by: axis
|