summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into ↵David Boddie2010-01-2815-268/+52
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | integration Conflicts: examples/dbus/dbus-chat/chat_adaptor.cpp examples/dbus/dbus-chat/chat_adaptor.h examples/dbus/dbus-chat/chat_interface.cpp examples/dbus/dbus-chat/chat_interface.h examples/dbus/remotecontrolledcar/car/car_adaptor.cpp examples/dbus/remotecontrolledcar/car/car_adaptor_p.h examples/dbus/remotecontrolledcar/controller/car_interface.cpp examples/dbus/remotecontrolledcar/controller/car_interface_p.h
| * examples/dbus: update remotecontrolledcar exampleAdemar de Souza Reis Jr2009-12-039-239/+26
| | | | | | | | | | The example was outdated, thus causing some confusion for someone who tries to follow it.
| * examples/dbus: update dbus-chat adaptor/interface filesAdemar de Souza Reis Jr2009-12-034-26/+23
| | | | | | | | | | The example was outdated, thus causing some confusion for someone who tries to follow it.
| * doc: Fix typo in QEvent::ignore() documentationAdemar de Souza Reis Jr2009-12-031-1/+1
| | | | | | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
| * doc: Fix qmake-manual warn_on/warn_off referencesAdemar de Souza Reis Jr2009-12-031-2/+2
| | | | | | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
* | Fix header labels on mac with rtlJens Bache-Wiig2010-01-281-2/+0
| | | | | | | | | | | | | | | | | | The removed code simply reduces the size of the rect when running with RightToLeft without compensating anywhere else. It seems to be a leftover from a previously removed piece of code. Reviewed-by: richard Task-number: QTBUG-6882
* | Add new QMetaObject test for signal lookup.Fabien Freling2010-01-281-0/+105
| |
* | Cocoa: implement usage of override cursorsRichard Moe Gustavsen2010-01-284-3/+43
| | | | | | | | | | | | | | This have never worked in the Cocoa port, it seems. This patch gives it a try. Reviewed-by: msorvig
* | Fix breakage introduced in 21e0423a5c9ecd9da8e141dcfba25e60b55f7fe5João Abecasis2010-01-282-0/+0
| | | | | | | | | | Turns out two of the files removed were still required by the resource compiler.
* | Fix QDirIterator auto testJoão Abecasis2010-01-277-63/+76
| | | | | | | | | | | | | | | | | | | | | | The test depended on being run inside the source directory, because of a dummy file hierarchy present there. With these changes the needed hierarchy is generated on the fly and cleaned up at the end of the test. Also removed garbage at the end of tst_QDirIterator::stopLinkLoop. Cleanup is done in test destructor.
* | Fix regressions introduced in 3a5eb87965b60a3e249a16dc48cb06f4759dfb1bJoão Abecasis2010-01-271-10/+10
| | | | | | | | Caching of LinkType and BundleType is independent of other file flags.
* | BenchLib: update the result format and self-test.Thiago Macieira2010-01-273-7/+11
| | | | | | | | | | | | | | | | Since BenchLib now uses floating point for its calculations, we should format both the value per-iteration and the total the same way. Otherwise, it would output something like "2e+08" for the total. Reviewed-by: Morten Sørvig
* | Fix crash handler regression introduced by c7739f7dd.Thiago Macieira2010-01-271-1/+2
| | | | | | | | | | | | | | The crash handler is removed when the FatalSignalHandler object goes out of scope, which it did right inside that if. Reviewed-By: Harald Fernengel
* | Make indexOfMethod not crash when going through a metaobject with ↵Thiago Macieira2010-01-271-2/+5
| | | | | | | | | | | | methodCount == 0. Reviewed-by: Bradley T. Hughes
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Pulse Build System2010-01-279-215/+282
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1: Optimise QStringList::join by pre-allocating the final size. Remove test binary left behind Whitespace cleanup cleanups & styling fixes QFileInfo: Implement additional caching of FileOwner strings qfileinfo_p.h: removed unnecessary dependency on QFSFileEngine Simplify QFileInfoPrivate::getFileTime QFileInfo: Don't re-stat files, when in caching mode QFileInfoPrivate::Data: don't call clear() from constructors fix regression introduced in 44766d2 Remove the tests/auto/networkdata dir, since this causes the maketestselftest test fail Add proper license headers to these files. Cocoa: qfiledialog test spits out memory warnings
| * | Optimise QStringList::join by pre-allocating the final size.Thiago Macieira2010-01-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids a number of reallocations due to appending. This patch was contributed to us. Task-number: QTBUG-3242 Reviewed-by: Thiago Macieira
| * | Remove test binary left behindThiago Macieira2010-01-261-0/+0
| | |
| * | Whitespace cleanupRitt Konstantin2010-01-261-68/+18
| | | | | | | | | | | | | | | Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | cleanups & styling fixesRitt Konstantin2010-01-261-47/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | `if(' -> `if (' `for(' -> `for (' remove needless qhash.h include Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | QFileInfo: Implement additional caching of FileOwner stringsRitt Konstantin2010-01-262-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | Reduce overhead of the uid/gid to user/group name conversion by caching results from QAbstractFileEngine::owner(). Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | qfileinfo_p.h: removed unnecessary dependency on QFSFileEngineRitt Konstantin2010-01-262-4/+4
| | | | | | | | | | | | | | | | | | | | | Moved includes into proper place. Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | Simplify QFileInfoPrivate::getFileTimeRitt Konstantin2010-01-261-18/+11
| | | | | | | | | | | | | | | | | | | | | remove repeated code; improve readability Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | QFileInfo: Don't re-stat files, when in caching modeRitt Konstantin2010-01-262-32/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separated testing for permissions flags, in order to speedup QFileInfo on Windows with qt_ntfs_permission_lookup flag turned on (especially on network shares). In QFileInfoPrivate::getFileFlags, avoid multiple calls to the engine, by concatenating all requests. Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | QFileInfoPrivate::Data: don't call clear() from constructorsRitt Konstantin2010-01-261-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | causes Refresh of file engine's internal cache, since `fileEngine' member is set before clear() is called. Initialize members with default values instead. Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | fix regression introduced in 44766d2Ritt Konstantin2010-01-261-0/+2
| | | | | | | | | | | | | | | | | | | | | null fileNames returned by fileEngine must be cached too Merge-request: 446 Reviewed-by: João Abecasis <joao@trolltech.com>
| * | Remove the tests/auto/networkdata dir, since this causes the ↵Thiago Macieira2010-01-261-1/+0
| | | | | | | | | | | | maketestselftest test fail
| * | Add proper license headers to these files.Thiago Macieira2010-01-263-39/+120
| | | | | | | | | | | | This makes the headers:licenseCheck test pass.
| * | Cocoa: qfiledialog test spits out memory warningsRichard Moe Gustavsen2010-01-261-0/+3
| | | | | | | | | | | | We need an auto release pool!
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-279-81/+81
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile of QTriangulator on Solaris. Fix compile on MSVC 2003. ARRAYSIZE macro doesn't exit. Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| * | | Fixed compile of QTriangulator on Solaris.Kim Motoyoshi Kalland2010-01-261-5/+7
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| * | | Fix compile on MSVC 2003. ARRAYSIZE macro doesn't exit.Alexis Menard2010-01-261-1/+1
| | | | | | | | | | | | | | | | Reviewed-by:Jan-Arve
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-267-75/+73
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-257-75/+73
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-257-75/+73
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | | | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-77/+75
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compile for wincewm60standard-msvc2008 (attempt 2) Fixed compile for wincewm60standard-msvc2008. Fixed compile. Fixed compile for wincewm60standard-msvc2008. Fixed compile when Qt is configured with -no-webkit build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | | | | * | | Fixed compile for wincewm60standard-msvc2008 (attempt 2)Rohan McGovern2010-01-221-3/+2
| | | | | | | | | |
| | | | | | | * | | Fixed compile for wincewm60standard-msvc2008.Rohan McGovern2010-01-221-1/+2
| | | | | | | | | |
| | | | | | | * | | Fixed compile.Rohan McGovern2010-01-221-1/+1
| | | | | | | | | |
| | | | | | | * | | Fixed compile for wincewm60standard-msvc2008.Rohan McGovern2010-01-221-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes partial revert of b4dd6ff29bc921ec81b4fd67ed44830e4d697d1d
| | | | | | | * | | Fixed compile when Qt is configured with -no-webkitRohan McGovern2010-01-221-2/+2
| | | | | | | | | |
| | | | | | | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Pulse Build System2010-01-229-106/+127
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2: build fix for mingw Build fix for MSVC2005 and older SDK QStyleSheetStyle: Fixed some text croped when having padding with native border. Remove obsolete code for unsupported platforms Character spacing when drawing a QPicture to a high DPI device.
| | | | | | | | * | | build fix for mingwThierry Bastian2010-01-181-1/+9
| | | | | | | | | | |
| | | | | | | | * | | Build fix for MSVC2005 and older SDKThierry Bastian2010-01-183-31/+47
| | | | | | | | | | |
| | | | | | | | * | | QStyleSheetStyle: Fixed some text croped when having padding with native border.Olivier Goffart2010-01-082-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native border width need to be taken into account in QRenderRule::boxRect() Task-number: QTBUG-6855 Reviewed-by: Benjamin Poulain (cherry picked from commit 6e90192b599cee9b903177a0978198326f667613)
| | | | | | | | * | | Merge remote branch 'origin/master'Olivier Goffart2010-01-08451-5848/+18836
| | | | | | | | |\ \ \
| | | | | | | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2Bill King2009-12-162-44/+14
| | | | | | | | |\ \ \ \
| | | | | | | | | * | | | Character spacing when drawing a QPicture to a high DPI device.Trond Kjernåsen2009-11-131-40/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drawing some text into a QPicture, and then drawing that QPicture to e.g. a QPrinter, would make the character spacing all wrong. The old approach that tried to fix this adjusted the DPI of the font that was used, so that the text size would be correct. It seems this is not enough, since it will lay out the text in the default resolution, and then scale that up, which may/may not introduce errors. Task-number: QTBUG-4974, 256481 Reviewed-by: Kim
generated by cgit v0.12 at 2025-01-04 05:36:34 (GMT)