diff mbox

qt: QT_COORD_TYPE_DOUBLE should only be set on soft float

Message ID 1430235747-5775-1-git-send-email-richard.genoud@gmail.com
State Accepted
Commit e07ec136ee3dd4bf16b18571623ac57f99136faa
Headers show

Commit Message

Richard Genoud April 28, 2015, 3:42 p.m. UTC 
If QT_COORD_TYPE_DOUBLE is forced and hard float is used, Qt compilation
breaks because it can't find hard coded operations on double.

Moreover, QT_COORD_TYPE is float only if QT_NO_FPU is set.
(cf src/corelib/global/qglobal.h)

So, we can safely make the QT_COORD_TYPE_DOUBLE option depend on
BR2_SOFT_FLOAT.

Reported-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
 package/qt/Config.in | 1 +
 1 file changed, 1 insertion(+)

based on master 2a15ce89ac5a
Compiled for:
cortexA8 in hard float/soft float with and without QT_COORD_TYPE_DOUBLE
x86_64
arm926t with and without QT_COORD_TYPE_DOUBLE

Comments

Peter Korsgaard April 28, 2015, 7:23 p.m. UTC | #1 
>>>>> "Richard" == Richard Genoud <richard.genoud@gmail.com> writes:

 > If QT_COORD_TYPE_DOUBLE is forced and hard float is used, Qt compilation
 > breaks because it can't find hard coded operations on double.

 > Moreover, QT_COORD_TYPE is float only if QT_NO_FPU is set.
 > (cf src/corelib/global/qglobal.h)

 > So, we can safely make the QT_COORD_TYPE_DOUBLE option depend on
 > BR2_SOFT_FLOAT.

 > Reported-by: Peter Korsgaard <peter@korsgaard.com>
 > Signed-off-by: Richard Genoud <richard.genoud@gmail.com>

Committed, thanks.
diff mbox

Patch

diff --git a/package/qt/Config.in b/package/qt/Config.in
index 83fdeec812bb..9568b7010cff 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -121,6 +121,7 @@  config BR2_PACKAGE_QT_CONFIG_FILE
 	  file, which Buildroot will give to Qt at compile time.
 
 config BR2_PACKAGE_QT_QT_COORD_TYPE_DOUBLE
+	depends on BR2_SOFT_FLOAT
 	bool "QT_COORD_TYPE to double"
 	help
 	  Set QT_COORD_TYPE to double. On ARM-based platforms, qreal