summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qdatetime.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2013-09-15 18:49:05 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-16 22:58:44 +0200
commit15c384f82f86e65718c67afcd99d7da7ffc011d2 (patch)
treedb014c352fbd2b8103b661bdcdf8fc69ed8ed07b /src/corelib/tools/qdatetime.cpp
parent36e768cd71ff18452f5257f113dab89214039949 (diff)
QDateTime: fix unused function warning on non-Windows
Change-Id: I8fbf1f8b0ebfdf58cd72c724326227dc1610e746 Reviewed-by: John Layt <jlayt@kde.org>
Diffstat (limited to 'src/corelib/tools/qdatetime.cpp')
-rw-r--r--src/corelib/tools/qdatetime.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index cf8159245d..dac1455d5c 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -3228,12 +3228,12 @@ bool QDateTime::operator<(const QDateTime &other) const
\sa currentDateTime(), currentDateTimeUtc(), toTime_t(), toTimeSpec()
*/
+#if defined(Q_OS_WIN)
static inline uint msecsFromDecomposed(int hour, int minute, int sec, int msec = 0)
{
return MSECS_PER_HOUR * hour + MSECS_PER_MIN * minute + 1000 * sec + msec;
}
-#if defined(Q_OS_WIN)
QDate QDate::currentDate()
{
QDate d;