diff options
| -rw-r--r-- | examples/sensors/cubehouse/cubehouse.pro | 2 | ||||
| -rw-r--r-- | src/imports/sensors/sensors.pro | 2 | ||||
| -rw-r--r-- | src/imports/sensors2/qsensor2tilt.cpp | 1 | ||||
| -rw-r--r-- | src/imports/sensors2/sensors2.pro | 2 | ||||
| -rw-r--r-- | src/plugins/sensors/dummy/dummycommon.cpp | 31 |
5 files changed, 31 insertions, 7 deletions
diff --git a/examples/sensors/cubehouse/cubehouse.pro b/examples/sensors/cubehouse/cubehouse.pro index b760ad7e..5fb289a1 100644 --- a/examples/sensors/cubehouse/cubehouse.pro +++ b/examples/sensors/cubehouse/cubehouse.pro @@ -2,7 +2,7 @@ TEMPLATE = app TARGET = cubehouse CONFIG += qt debug warn_on requires(contains(QT_CONFIG,opengl)) -QT += opengl sensors +QT += opengl sensors widgets SOURCES = \ view.cpp \ main.cpp \ diff --git a/src/imports/sensors/sensors.pro b/src/imports/sensors/sensors.pro index d40565f4..de212fe5 100644 --- a/src/imports/sensors/sensors.pro +++ b/src/imports/sensors/sensors.pro @@ -3,7 +3,7 @@ TARGETPATH = QtMobility/sensors include(qsensorsimport.pri) -QT = declarative sensors +QT += declarative sensors SOURCES += sensors.cpp diff --git a/src/imports/sensors2/qsensor2tilt.cpp b/src/imports/sensors2/qsensor2tilt.cpp index 03251909..b9507593 100644 --- a/src/imports/sensors2/qsensor2tilt.cpp +++ b/src/imports/sensors2/qsensor2tilt.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "qsensor2tilt.h" +#define _USE_MATH_DEFINES #include <math.h> #include <errno.h> #include <QtCore/QDebug> diff --git a/src/imports/sensors2/sensors2.pro b/src/imports/sensors2/sensors2.pro index 1c77ed1b..d7133b27 100644 --- a/src/imports/sensors2/sensors2.pro +++ b/src/imports/sensors2/sensors2.pro @@ -3,7 +3,7 @@ TARGETPATH = QtSensors include(qsensors2import.pri) -QT = declarative sensors +QT += declarative sensors SOURCES += sensors2.cpp \ qsensor2ambientlight.cpp \ diff --git a/src/plugins/sensors/dummy/dummycommon.cpp b/src/plugins/sensors/dummy/dummycommon.cpp index e3c7d044..264c4206 100644 --- a/src/plugins/sensors/dummy/dummycommon.cpp +++ b/src/plugins/sensors/dummy/dummycommon.cpp @@ -41,8 +41,8 @@ #include "dummycommon.h" -#ifdef Q_OS_WINCE -#include <windows.h> +#ifdef Q_OS_WIN +#include <QtCore/qt_windows.h> // WINCE has <time.h> but using clock() gives a link error because // the function isn't actually implemented. #else @@ -101,12 +101,35 @@ static qint64 absoluteToNSecs(qint64 cpuTime) qint64 nsecs = cpuTime * info.numer / info.denom; return nsecs; } +#elif defined(Q_OS_WIN) +// Obtain a time stamp from the performance counter, +// default to tick count. +static quint64 windowsTimeStamp() +{ + static bool hasFrequency = false; + static quint64 frequency = 0; + if (!hasFrequency) { + LARGE_INTEGER frequencyLI; + hasFrequency = true; + QueryPerformanceFrequency(&frequencyLI); + frequency = frequencyLI.QuadPart; + } + + if (frequency) { // Microseconds. + LARGE_INTEGER counterLI; + if (QueryPerformanceCounter(&counterLI)) + return 1000000 * counterLI.QuadPart / frequency; + } + return GetTickCount(); +} #endif quint64 dummycommon::getTimestamp() { -#ifdef Q_OS_WINCE - // This implementation is based on code found here: +#if defined(Q_OS_WIN) + return windowsTimeStamp(); +#elif defined(Q_OS_WINCE) + //d This implementation is based on code found here: // http://social.msdn.microsoft.com/Forums/en/vssmartdevicesnative/thread/74870c6c-76c5-454c-8533-812cfca585f8 HANDLE currentThread = GetCurrentThread(); FILETIME creationTime, exitTime, kernalTime, userTime; |