summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-04-282-2/+8
|\ | | | | | | kinetic-declarativeui
| * Merge branch '4.5'Thiago Macieira2009-04-232-2/+8
| |\ | | | | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | * Fixes for QByteArrayMatcherJoão Abecasis2009-04-232-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy constructor and assignment operator lose data: pointer to content and the length of content also need to be copied over. QByteArrayMatcher::pattern() would return a null byte array if instance was initialized with c-string. Changed default constructor to explicitly initialize pattern length to zero. The bug in the assignment operator is a regression against 4.4.3. Task-number: 251958 Reviewed-by: MariusSO Reviewed-by: paul
* | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-221-2/+2
|\ \ \ | |/ /
| * | Merge branch '4.5'Thiago Macieira2009-04-201-2/+2
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qaction/tst_qaction.cpp
| | * don't detach in qHash()Lars Knoll2009-04-201-2/+2
| | | | | | | | | | | | Signed-off-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-225-53/+1028
|/ /
* | Introduce QPointF::manhattanLengthGunnar Sletta2009-04-152-0/+15
| | | | | | | | Task-number: 251068
* | Merge commit 'origin/4.5'Olivier Goffart2009-04-152-18/+18
|\ \ | |/ | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * Fix regression in QString::replace(int, int, QChar) when string is emptyPaul Olav Tvete2009-04-151-18/+16
| | | | | | | | | | | | | | | | | | | | When QString::replace was optimized, this specific overload missed out on sanity checking of the arguments. Task-number: 249517 Reviewed-by: Joao Reviewed-by: hjk BT: yes
| * Compile with namespaceJarek Kobus2009-04-151-0/+2
| | | | | | | | Reviewed-by: hjk <qtc-committer@nokia.com>
* | Rename qIsFuzzyNull to qFuzzyIsNullBjoern Erik Nilsen2009-04-081-4/+4
| | | | | | | | | | | | | | | | | | | | The function was added in fde7f3d03782c801901f511131458d6fcb1021a5 and we believe qFuzzyIsNull is a better naming and more in line with qFuzzyCompare. Reviewed-by: Lars Knoll Reviewed-by: nrc Reviewed-by: Samuel
* | Use qIsFuzzyNull rather than the more expensive qFuzzyCompareBjoern Erik Nilsen2009-04-081-4/+4
| | | | | | | | | | | | | | See also fde7f3d03782c801901f511131458d6fcb1021a5 Reviewed-by: Olivier Reviewed-by: Samuel
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-022-4/+4
|\ \ | |/ | | | | | | Conflicts: tools/linguist/shared/profileevaluator.cpp
| * Doc - fixed a typo: iterartor -> iteratorSimon Hausmann2009-04-022-4/+4
| | | | | | | | Reviewed-by: Trust me
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-011-1/+2
|\ \ | |/ | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| * Explicitely mentioned in the doc that the format string for qDebug,Denis Dzyubenko2009-03-301-1/+2
| | | | | | | | | | | | qWarning and qFatal should be in Latin1. Reviewed-by: Thiago
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-301-3/+6
|\ \ | |/
| * String-to-number conversion functions should ignore trailing whitespaces.Denis Dzyubenko2009-03-301-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | According to our documentation we should ignore leading and trailing whitespaces when converting a string to number with QLocale::toInt and similar functions. However that didn't work for some locales - for those ones that declare groupseparator as 0xa0 (which looks similar to space) since we provide a workaround to accept space as a group separator for those locales. And since the workaround was there for a long time it doesn't make sense to change the behavior and the fix is to explicitely remove leading and trailing whitespaces before doing any conversion. Reviewed-by: mariusSO
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-251-5/+13
|\ \ | |/
| * Fix QSharedPointer crashing when it is used as a global static in an ↵Thiago Macieira2009-03-251-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | application. If it's used as a static, then the order of destruction is ill-defined. The QSharedPointer object may be destroyed after our Q_GLOBAL_STATIC knownPointers has been deleted, thus causing a null-pointer dereference. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com> Task-number: 246843
| * Long live Qt 4.5!Lars Knoll2009-03-2373-0/+77103
|
* Long live Qt!Lars Knoll2009-03-2373-0/+77117