summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-171-4/+4
|\
| * Do not call macToQtFormat twice in QLocale.Denis Dzyubenko2009-12-161-4/+4
| | | | | | | | | | | | | | We already convert date/time format inside the getMacDateFormat, so no reason to do it again later. Reviewed-by: Prasanth
| * Revert "Changes to support locale change event for symbian platform"Denis Dzyubenko2009-12-163-153/+16
| | | | | | | | | | | | Revert a change that is not yet complete and was pushed by mistake. This reverts commit 44f7c1e097582a704a06ccbbf516536b88ddcd3a.
| * Changes to support locale change event for symbian platformdka2009-12-153-16/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-12-162-1/+4
|\ \ | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def
| * | Fix warning in public headerOlivier Goffart2009-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | qcache.h:73: warning: declaration of 'object' shadows a member of this Spotted by compilerwarnings autotest Reviewed-by: Thiago
| * | Fixed invalid read in QCache::unlink after recent change.Samuel Rødal2009-12-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | We need to store a pointer to the object in order to delete it later, since the node containing the pointer will be deleted when removing it from the hash. Reviewed-by: Jan-Arve Sæther
| * | Prevented leak of keys in QPixmapCache.Samuel Rødal2009-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing a pixmap from the pixmap cache using the new QPixmapCache::Key API left the keys dangling in the QCache's internal QHash. The problem is that the Key is invalidated as soon as the QPixmapCacheEntry is destroyed, thus removing it from the hash failed. Reordering the destruction of the object and the removal of the key in QHash fixes the problem. Reviewed-by: Alexis Reviewed-by: Thiago
| * | Compile with QT_NO_DEPRECATEDOlivier Goffart2009-12-091-0/+2
| |/ | | | | | | | | | | | | uses of QT_DEPRECATED must be protected by #ifdef Task-number: QTBUG-6649 Reviewed-by: João Abecasis
* | qreal-izationAleksandar Sasha Babic2009-12-111-2/+2
|/ | | | | | | | | | | | In some places we do have direct math related calls. Almost all are calling the double precision functions even if the args and results are float. This leads to unnecessary float->double and double->float transitions. By using wrapper functions we can control which functrion variants are effectively called. Task-number: QTBUG-4894 Reviewed-by: Shane Kearns
* Fixed (unstable) tst_QTimeLine::currentTime test failureRohan McGovern2009-12-091-1/+1
| | | | | | | | Use qFuzzyCompare instead of an exact floating point comparison when checking if valueChanged should be emitted. Task-number: QTBUG-6189 Reviewed-by: Dmytro Poplavskiy
* Merge commit '33441e2a611f07207b0b942368aab9010cdf8ab1' of ↵Simon Hausmann2009-12-051-4/+4
|\ | | | | | | oslo-staging-1/4.6 into 4.6
| * Fix Run-Time Check Failure with MSVC when downcasting.Thiago Macieira2009-12-031-4/+4
| | | | | | | | | | | | | | | | When you cast from a 64-bit type to a 32-bit one, MSVC produces an RTCF, despite the explicit cast. The solution is to add & 0xFFFFFFFF. Task-number: QTBUG-4255 Reviewed-by: Marius Storm-Olsen
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-12-031-2/+4
|\ \ | |/
| * Fix crash in QVector::reserve when reserving smaller size on a shared vectorOlivier Goffart2009-12-011-2/+4
| | | | | | | | | | | | | | | | | | | | We cannot call realloc with aalloc smaller than asize. Also include obvious optimisation: take the qMin computation out of the loop. Task-number: QTBUG-6416 Reviewed-by: Thiago
* | QVector: fix const_iterator-=(int)hjk2009-11-301-1/+1
|/ | | | Reviewed-by: Harald Fernengel
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-173-9/+37
|\
| * doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-161-3/+28
| | | | | | | | | | | | Someone had changed an operator==() and an operator!=() from single parameter members to two-parameter friends but hadn't changed the qdoc comments.
| * Fix compilation on solaris-g++-64.Thiago Macieira2009-11-131-0/+1
| | | | | | | | | | | | | | | | Add the "reserved" member to QVectorData in that configuration. Since this is only about the bootstrapped version of Qt, there are no binary compatibility issues. Reviewed-by: Bradley T. Hughes
| * doc: Fixed qdoc according to Bjarne's recommendation.Martin Smith2009-11-131-6/+8
| | | | | | | | | | | | Someone had changed an operator==() and an operator!=() from single parameter members to two-parameter friends but hadn't changed the qdoc comments.
* | do not (fail to) compile qdatastream into qmake and cetestOswald Buddenhagen2009-11-134-4/+4
| | | | | | | | | | for some reason, this did build on linux and windows, but symbian seems somewhat stricter.
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-131-0/+20
|\ \ | |/
| * Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-113-65/+153
| | | | | | | | | | | | | | | | | | The API is internal, so it should live in its private header. The class was introduced during the lifetime of 4.6 (not in 4.5), so the move is binary compatible. Task-number: QTBUG-5617 Reviewed-by: João Abecasis <joao@abecasis.name>
| * Make QScopedPointer::operator== and != non-memberJoão Abecasis2009-11-111-40/+12
| | | | | | | | | | | | | | | | | | | | Non-member operator allows implicit conversions on both arguments. A single operator is enough to support QScopedArrayPointer, QCustomScopedPointer and QScopedSharedPointer since equality semantics don't change and the deleter is managed in the base class. Reviewed-by: Marius Storm-Olsen
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-105-45/+30
|\ \ | | | | | | | | | | | | Conflicts: tools/configure/configureapp.cpp
| * \ Merge branch 'tools-team/4.6' (early part) into 4.6Oswald Buddenhagen2009-11-103-65/+133
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qscopedpointer.h
| * | | Make QScopedPointer::operator== and != non-memberJoão Abecasis2009-11-101-40/+12
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Non-member operator allows implicit conversions on both arguments. A single operator is enough to support QScopedArrayPointer, QCustomScopedPointer and QScopedSharedPointer since equality semantics don't change and the deleter is managed in the base class. Reviewed-by: Marius Storm-Olsen
| * | Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-093-5/+18
| |\ \
| | * | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-063-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* | | | build lrelease bootstrappedOswald Buddenhagen2009-11-104-6/+4
| |_|/ |/| | | | | | | | | | | | | | | | | | | | needed for build-time qm generation in qt itself. the downsides are a) that the other bootstrapped tools grow by ~12kB (on x86) due to qdatastream being pulled in by qbytearray and qstring and b) that lrelease isn't l10n'd itself anymore (the latter could be fixed by building a non-qobject qtranslator).
* | | Move QCustomScopedPointer to a private headerHarald Fernengel2009-11-093-85/+153
|/ / | | | | | | | | | | | | | | | | The API is internal, so it should live in its private header. The class was introduced during the lifetime of 4.6 (not in 4.5), so the move is binary compatible. Task-number: QTBUG-5617 Reviewed-by: João Abecasis <joao@abecasis.name>
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-063-4/+4
|\ \
| * \ Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-062-3/+3
| |\ \ | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * \ Merge branch '4.6-s60' into 4.6axis2009-11-061-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Fix compile error for Symbian WINSCW emulatorShane Kearns2009-11-031-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Iain
| | * | add support for the N'Ko writing system to QtLars Knoll2009-11-061-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | Enables N'Ko support in Qt, after having now a harfbuzz version that supports it. Task-number: QTBUG-1042 Reviewed-by: Gunnar
| * | Avoid warning on 64 bit systemsJan-Arve Sæther2009-11-041-1/+1
| |/
* | use pragma push/popHarald Fernengel2009-11-062-3/+11
| | | | | | | | | | | | prevents leaking the pragma out of the header file Task-number: QT-2267
* | Fix MSVC compiler warning.Friedemann Kleint2009-11-051-1/+1
| | | | | | | | | | Forward declare struct QAbstractConcatenable correctly. Reviewed-by: hjk <qtc-committer@nokia.com>
* | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-048-100/+226
|\ \ | |/
| * Merge commit 'e4bec39a139363d1ee4cf3fb15a3fe4499215e77' into 4.6Thiago Macieira2009-11-028-100/+226
| |\
| | * Fix compilation in QContiguousCache.Thiago Macieira2009-10-291-3/+3
| | | | | | | | | | | | Reviewed-by: TrustMe
| | * Initialise the reserved bits to 0.Thiago Macieira2009-10-287-4/+11
| | | | | | | | | | | | | | | | | | | | | This is future compatibility: we must rely on them being 0 in older versions of Qt. Reviewed-by: Bradley T. Hughes
| | * Fix Qt containers to properly support types with strict alignments.Thiago Macieira2009-10-288-36/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QContiguousCache is a new type, so there are no binary compatibility issues. QHash and QMap didn't have any public qMalloc / qFree, so the entire logic is contained in .cpp code. However, since old code will not inform us of the alignment requirements, we need to add a bit to the structure to indicate whether strict alignment is in use or not. QList doesn't require any changes. For small, movable types, they're all stored in the pointer array itself, so they're aligned. For larger types, we use new(), so types with stricter requirements should define their own operator new(). QLinkedList cannot be fixed. It uses new() on the QLinkedListNode, which contains a T type. Sorry. QVector did have public qMalloc / qFree. I've moved the calls to the inner function and made it keep the old calls if the alignment requirement is below a certain threshold. The idea is that, if it's above, no one was using QVector anyway. Reviewed-by: Bradley T. Hughes
| | * Add some STL compatibility for QContiguousCache and private inheritanceThiago Macieira2009-10-281-60/+65
| | | | | | | | | | | | | | | | | | | | | | | | The private inheritance ensures that we don't try to access the types under the wrong pointer. If we did that, we'd cause strict aliasing violations. Reviewed-by: Olivier Goffart
* | | Make QStringBuilder respect codecForCStringsHarald Fernengel2009-11-043-21/+62
| | | | | | | | | | | | | | | | | | | | | Now, it's a real drop-in replacement, with no known feature regressions :) Reviewed-By: hjk
* | | fix canReadLine() erroneously returning trueOswald Buddenhagen2009-11-031-0/+27
|/ / | | | | | | | | | | | | the indexOf() call did not consider actualReadBufferSize and thus scanned uninitialized memory for newlines. Reviewed-by: phartman
* | Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-301-1/+3
|\ \
| * | QLocale: AM/PM symbol support for symbian platformdka2009-10-281-1/+3
| |/ | | | | | | Reviewed-by: Denis Dzyubenko
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into origin-4.6Olivier Goffart2009-10-301-3/+3
|\ \
generated by cgit v0.12 at 2025-02-05 02:23:52 (GMT)