Make the Windows qt_msectime() function return 64-bit

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

View File

@ -58,7 +58,7 @@ class QEventDispatcherWin32Private;
// forward declaration
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
{

View File

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

View File

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