summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-08-07 08:46:26 +0200
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-08-25 03:45:56 +0000
commitde1ecd10ab7af694f8a3e427c6be83738879d11e (patch)
treee6fe8940654bf2cf6210239064a2ab6d4116dca6
parent9eab0161f465c35b996fad9451ad07c5b0c2b38d (diff)
downloadqtdeclarative-de1ecd10ab7af694f8a3e427c6be83738879d11e.tar.gz
qtdeclarative-de1ecd10ab7af694f8a3e427c6be83738879d11e.tar.bz2
qtdeclarative-de1ecd10ab7af694f8a3e427c6be83738879d11e.zip
Fix compiler warnings on recent clang
Add some Q_DECL_OVERRIDE and a cast Change-Id: I834d16049805b5fc6e64a64d26cd6c92ac873163 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--src/quick/util/qquickglobal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index 391e0b734..25dd09c01 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -374,7 +374,7 @@ public:
return QMatrix4x4(matVals);
}
- const QMetaObject *getMetaObjectForMetaType(int type)
+ const QMetaObject *getMetaObjectForMetaType(int type) Q_DECL_OVERRIDE
{
switch (type) {
case QMetaType::QColor: