From 39852ce60f4de4c454b4bf19ef87bbcdad0aa76c Mon Sep 17 00:00:00 2001
From: BogDan Vatra <bogdan@kdab.com>
Date: Wed, 16 Aug 2017 12:57:48 +0300
Subject: Android: Fix warning for __fp16

Change-Id: I65cd64dfc0ed357555e8b5276109303377a67e0e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/global/qfloat16.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/corelib/global')

diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
index 054d503249..89a62a93db 100644
--- a/src/corelib/global/qfloat16.h
+++ b/src/corelib/global/qfloat16.h
@@ -141,7 +141,7 @@ inline qfloat16::operator float() const Q_DECL_NOTHROW
 #elif defined (__ARM_FP16_FORMAT_IEEE)
     __fp16 f16;
     memcpy(&f16, &b16, sizeof(quint16));
-    return f16;
+    return float(f16);
 #else
     quint32 u = mantissatable[offsettable[b16 >> 10] + (b16 & 0x3ff)]
                 + exponenttable[b16 >> 10];
-- 
cgit v1.2.3