diff options
author | Konstantin Ritt <ritt.ks@gmail.com> | 2011-10-07 12:45:33 (GMT) |
---|---|---|
committer | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-10-07 12:45:33 (GMT) |
commit | 74251fb0fc57b1e0f7db0b561e4aa4c0347f6f37 (patch) | |
tree | c502d03701b8a700f9c0e83aadac4acc7ea975d5 /src/corelib/kernel | |
parent | 1bfef526ef3d1deb7cf0f11dc1880f33937a85ac (diff) | |
download | Qt-74251fb0fc57b1e0f7db0b561e4aa4c0347f6f37.zip Qt-74251fb0fc57b1e0f7db0b561e4aa4c0347f6f37.tar.gz Qt-74251fb0fc57b1e0f7db0b561e4aa4c0347f6f37.tar.bz2 |
simplify the code by using QSystemLibrary a bit smarter
Merge-request: 2655
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qeventdispatcher_win.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index 84663fa..3e367b7 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -328,13 +328,15 @@ static void resolveTimerAPI() return; #endif triedResolve = true; -#if !defined(Q_OS_WINCE) - qtimeSetEvent = (ptimeSetEvent)QSystemLibrary::resolve(QLatin1String("winmm"), "timeSetEvent"); - qtimeKillEvent = (ptimeKillEvent)QSystemLibrary::resolve(QLatin1String("winmm"), "timeKillEvent"); +#ifndef Q_OS_WINCE + QSystemLibrary library(QLatin1String("Mmtimer")); #else - qtimeSetEvent = (ptimeSetEvent)QSystemLibrary::resolve(QLatin1String("Mmtimer"), "timeSetEvent"); - qtimeKillEvent = (ptimeKillEvent)QSystemLibrary::resolve(QLatin1String("Mmtimer"), "timeKillEvent"); + QSystemLibrary library(QLatin1String("winmm")); #endif + if (library.load()) { + qtimeSetEvent = (ptimeSetEvent)library.resolve("timeSetEvent"); + qtimeKillEvent = (ptimeKillEvent)library.resolve("timeKillEvent"); + } } } |