File 0001-Fix-qfloat16-methods-definition-without-de... of Package libqt5-qtbase

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-qfloat16-methods-definition-without-declaration-.patch of Package libqt5-qtbase (Revision 3f9e6b5d65731599084b1115e26a6c17)

Currently displaying revision 3f9e6b5d65731599084b1115e26a6c17 , Show latest

From edc15323b4ef13a2a58ba4bebd46a78449b628ee Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <alarrosa@suse.com>
Date: Fri, 21 Dec 2018 12:33:39 +0100
Subject: [PATCH] Fix qfloat16 methods definition without declaration when
 using Q_QDOC

This fixes qtdoc failing to build on i586 because of an assertion in
libclang since Q_QDOC is defined and thus the declaration of the
qfloat16(float) constructor and operator float() are removed, thus
their definitions should be removed too, which is what this patch
does.

This patch was done together with Michal Srb <msrb@suse.com>.

Fixes: QTBUG-72725

Change-Id: I6424873425d46345e09f411f9ce88f2520825da4
---
 src/corelib/global/qfloat16.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
index a8befd7adb..3e50ad8467 100644
--- a/src/corelib/global/qfloat16.h
+++ b/src/corelib/global/qfloat16.h
@@ -123,6 +123,7 @@ Q_REQUIRED_RESULT inline bool qIsNull(qfloat16 f) Q_DECL_NOTHROW
 inline int qIntCast(qfloat16 f) Q_DECL_NOTHROW
 { return int(static_cast<float>(f)); }
 
+#ifndef Q_QDOC
 QT_WARNING_PUSH
 QT_WARNING_DISABLE_CLANG("-Wc99-extensions")
 QT_WARNING_DISABLE_GCC("-Wold-style-cast")
@@ -162,6 +163,7 @@ inline qfloat16::operator float() const Q_DECL_NOTHROW
     return f;
 #endif
 }
+#endif
 
 inline qfloat16 operator-(qfloat16 a) Q_DECL_NOTHROW
 {
-- 
2.19.2

Places

File 0001-Fix-qfloat16-methods-definition-without-declaration-.patch of Package libqt5-qtbase (Revision 3f9e6b5d65731599084b1115e26a6c17)

Places