summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into ↵David Boddie2010-01-293-1/+209
|\ | | | | | | | | | | | | | | | | | | | | | | 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/controller/car_interface.cpp
| * Fix build due to missing auto-generated files on dbus exampleAdemar de Souza Reis Jr2010-01-292-0/+208
| | | | | | | | | | | | | | Breakage introduced by my previous commit: a1c6fdf0fe5a51b5955ea3fc5f6c3eceee24e0f8 Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
| * examples/dbus: update remotecontrolledcar exampleAdemar de Souza Reis Jr2010-01-299-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 Jr2010-01-294-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 Jr2010-01-291-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 Jr2010-01-291-2/+2
| | | | | | | | Signed-off-by: Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
* | Use X/Open LFS extensions for 64-bit support on directory iterationJoão Abecasis2010-01-295-26/+54
| | | | | | | | | | | | | | | | | | | | | | | | This boils down to using readdir64(_r) and struct dirent64 where available. I assumed these are available in the same platforms other such extensions are already being used. AIX uses the additional type DIR64 and opendir64/closedir64 to manipulate it. Task-number: QTBUG-2781 Reviewed-by: Thiago Macieira
* | nano-optimizationsRitt Konstantin2010-01-291-10/+4
| | | | | | | | | | Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
* | code cleanup and styling fixesRitt Konstantin2010-01-292-159/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | * remove trailing whitespaces * tabs -> whitespaces * "if(" -> "if (" * "while(" -> "while (" * "for(" -> "for (" * "for (int i.*; i++)" -> "for (int i.*; ++i)" /* looks better ;) */ * minor doc fixes Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
* | QDirPrivate: remove unused q_ptr and Q_DECLARE_PUBLICRitt Konstantin2010-01-291-13/+8
| | | | | | | | | | | | | | | | update constructor signatures; both private and protected members became public. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
* | QDir: clear internal file lists cache earlyRitt Konstantin2010-01-291-4/+3
| | | | | | | | | | | | | | | | If the cache was invalidated (setPath, refresh, detach, etc.) then there is no sense to keep it any longer. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
* | QDirPrivate::setPath: always initialize the file engineRitt Konstantin2010-01-291-9/+4
| | | | | | | | | | | | | | | | | | | | QDir::isRelativePath() would construct a temporary file engine just to check if we could reuse the existing one. This was also making assumptions about the inner workings of the engine, that might not be valid outside QFSFileEngine. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
* | optimize QDir::cd()Ritt Konstantin2010-01-291-7/+6
| | | | | | | | | | | | | | | | We already create a file engine for testing if dir exists. We can also use it as source for current QDir. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
* | QDirPrivate::Data: remove needless clear()-s in constructorsRitt Konstantin2010-01-291-5/+4
| | | | | | | | | | | | | | Initialize members with default values in constructor, instead. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
* | QDir::cleanPath: strip trailing slash for "/:/" on non-win platformsRitt Konstantin2010-01-292-3/+13
| | | | | | | | | | Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
* | QDir::entry(Info)List(): really use cached dataRitt Konstantin2010-01-291-2/+6
| | | | | | | | | | | | | | | | | | The test conditions for using cached file lists were wrong and preventing list reuse unless no filters or sorting flags were previously set. Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
* | Fix QDir::operator[] documentationRitt Konstantin2010-01-291-4/+1
| | | | | | | | | | Merge-request: 445 Reviewed-by: João Abecasis <joao@trolltech.com>
* | Carbon: crash problem in QWidgetPrivate::hide_sys, v2Richard Moe Gustavsen2010-01-292-1/+3
| | | | | | | | | | | | | | | | See change: f842ec12706. Needed some ekstra checks for the cocoa port as well. Task-number: QTBUG-4227 Reviewed-by: Prasanth
* | Carbon: crash problem in QWidgetPrivate::hide_sysRichard Moe Gustavsen2010-01-291-0/+2
| | | | | | | | | | | | | | | | | | | | The crash occurs because we at one point try to assign a widget that is marked as 'about to be deleted' to a QPointer, after clearguards has been called. The correct fix is to avoid such an assignment in the first place. Task-number: QTBUG-4227 Reviewed-by: Prasanth
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2916-270/+52
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix header labels on mac with rtl examples/dbus: update remotecontrolledcar example examples/dbus: update dbus-chat adaptor/interface files doc: Fix typo in QEvent::ignore() documentation doc: Fix qmake-manual warn_on/warn_off references
| * \ 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
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-286-13/+90
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Added new funcs to QAudioFormat and QAudioDeviceInfo class's.
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ↵Qt Continuous Integration System2010-01-286-13/+90
| |\ \ \ |/ / / / | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team: Added new funcs to QAudioFormat and QAudioDeviceInfo class's.
| * | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-28298-5855/+4882
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp
| * \ \ \ Merge branch 'master' of ../../qt/masterJustin McPherson2010-01-1510070-97843/+146870
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/multimedia/audioinput/audioinput.cpp src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp src/multimedia/audio/qaudioinput_win32_p.cpp src/multimedia/audio/qaudiooutput_win32_p.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp
| * | | | | Added new funcs to QAudioFormat and QAudioDeviceInfo class's.Kurt Korbatits2010-01-1524-103/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAudioFormat::setChannelCount(), channelCount() QAudioFormat::setSampleRate(), sampleRate() QAudioDeviceInfo::supportedChannelCounts(), supportedSampleRates() Changed all instances to use these new functions instead of channels(),frequency(),setFrequency(),setChannels() supportedChannels(),supportedFrequencies() Old functions still exist but are marked obsolete. Reviewed-by:Justin McPherson
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2824-291/+524
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (21 commits) Add new QMetaObject test for signal lookup. Cocoa: implement usage of override cursors Fix breakage introduced in 21e0423a5c9ecd9da8e141dcfba25e60b55f7fe5 Fix QDirIterator auto test Fix regressions introduced in 3a5eb87965b60a3e249a16dc48cb06f4759dfb1b BenchLib: update the result format and self-test. Fix crash handler regression introduced by c7739f7dd. Make indexOfMethod not crash when going through a metaobject with methodCount == 0. 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. ...
| * | | | 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>
generated by cgit v0.12 at 2025-08-25 16:31:49 (GMT)