diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-21 07:53:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-21 07:53:10 (GMT) |
| commit | da46da0a33c883f6cdcc155e137a9dc75f68b8fe (patch) | |
| tree | 2e9123ba3e171d4c1504bbbad5645cc42244d92d | |
| parent | 69e848ff4a8dad648f706a34b106b8a84155c875 (diff) | |
| parent | 05b1d910221ca5d9bf2165fd1aad4606537bdd9f (diff) | |
| download | Qt-da46da0a33c883f6cdcc155e137a9dc75f68b8fe.zip Qt-da46da0a33c883f6cdcc155e137a9dc75f68b8fe.tar.gz Qt-da46da0a33c883f6cdcc155e137a9dc75f68b8fe.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:
Fix for WinCE compilation of QAbstractSpinBox.
| -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 |