AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the Windows qt_msectime() function return 64-bit

Browse Source 
32-bit integers overflow after 49.7 days.

Task-number: QTBUG-43777
Change-Id: Ief8943bc86ba32e5a66b48604c583031af95ad42
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
Thiago Macieira 2015-06-30 12:56:43 -07:00
parent 1e8a5c1083
commit 1ac0c4a2f7
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qeventdispatcher_win_p.h
View File

@ -58,7 +58,7 @@ class QEventDispatcherWin32Private;
// forward declaration // forward declaration
LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp); LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp);
int qt_msectime(); quint64 qt_msectime();
class Q_CORE_EXPORT QEventDispatcherWin32 : public QAbstractEventDispatcher class Q_CORE_EXPORT QEventDispatcherWin32 : public QAbstractEventDispatcher
{ {

2
src/corelib/kernel/qeventdispatcher_winrt_p.h
View File

@ -52,7 +52,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
int qt_msectime(); quint64 qt_msectime();
class QEventDispatcherWinRTPrivate; class QEventDispatcherWinRTPrivate;

2
src/corelib/tools/qelapsedtimer_win.cpp
View File

@ -117,7 +117,7 @@ static quint64 getTickCount()
#endif // Q_OS_WINRT #endif // Q_OS_WINRT
} }
int qt_msectime() quint64 qt_msectime()
{ {
return ticksToNanoseconds(getTickCount()) / 1000000; return ticksToNanoseconds(getTickCount()) / 1000000;
} }