diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-22 05:54:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-22 05:54:31 (GMT) |
| commit | 2fdff5431f585c08d43a6abc04e6a7ecbe588986 (patch) | |
| tree | 7246b42d94db44ccaabdeb79b9da51e593da059e /src/gui/widgets | |
| parent | beb16e0d8b3b81a67170c578a72d3816b87569cc (diff) | |
| parent | 3f0a7ff17d6dba19ab3d73e3336990bedbfe14e7 (diff) | |
| download | Qt-2fdff5431f585c08d43a6abc04e6a7ecbe588986.zip Qt-2fdff5431f585c08d43a6abc04e6a7ecbe588986.tar.gz Qt-2fdff5431f585c08d43a6abc04e6a7ecbe588986.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( de77f8ee69c434bde9306c8f407ee2e443a00188 )
Drag and drop icon not updated correctly in Cocoa.
Adding missing file.
Warn when calling QFileInfo::absolutePath() on an improper object.
update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155
Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was being included by src/xmlpatterns.
Fix for WinCE compilation of QAbstractSpinBox.
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qabstractspinbox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp index a59cd48..e26d5c3 100644 --- a/src/gui/widgets/qabstractspinbox.cpp +++ b/src/gui/widgets/qabstractspinbox.cpp @@ -1180,7 +1180,7 @@ static int getKeyboardAutoRepeatRate() { TTimeIntervalMicroSeconds32 time; S60->wsSession().GetKeyboardRepeatRate(initialTime, time); ret = time.Int() / 1000; // msecs -#elif defined(Q_OS_WIN) and !defined(Q_OS_WINCE) +#elif defined(Q_OS_WIN) && !defined(Q_OS_WINCE) DWORD time; if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &time, 0) != FALSE) ret = static_cast<int>(1000 / static_cast<int>(time)); // msecs |