aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlglobal_p.h
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-08-24 10:05:53 +1000
committerQt by Nokia <qt-info@nokia.com>2012-08-24 07:07:56 +0200
commite8e3c206ac0d2ff436f7166fb73f33a7e8259b6a (patch)
treeae9bd0c1a09e5992241a7decd8d2a5adec6da98d /src/qml/qml/qqmlglobal_p.h
parentacf5251f855c8af7cd27776ecb1c9c7370b066bb (diff)
Fix warnings in QtQml
Change-Id: Ibba3b8e878257f7019bdc90a1344462b77f95a21 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlglobal_p.h')
-rw-r--r--src/qml/qml/qqmlglobal_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlglobal_p.h b/src/qml/qml/qqmlglobal_p.h
index e79a91f035..342c982140 100644
--- a/src/qml/qml/qqmlglobal_p.h
+++ b/src/qml/qml/qqmlglobal_p.h
@@ -167,7 +167,7 @@ T qmlobject_cast(QObject *object)
inline quint16 qmlSourceCoordinate(int n)
{
- return (n > 0 && n <= USHRT_MAX) ? static_cast<quint16>(n) : 0;
+ return (n > 0 && n <= static_cast<int>(USHRT_MAX)) ? static_cast<quint16>(n) : 0;
}
inline int qmlSourceCoordinate(quint16 n)