diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-06 01:00:08 +0100 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-11-06 19:44:29 +0100 |
commit | 75f791419c54311e1ebf14a0c1651192ab0349f1 (patch) | |
tree | bcdf78298f7978603aec570b4c9ef66e06819fc7 /util | |
parent | b274f656b82e06fad492e241dae6ae65cb377ad1 (diff) | |
parent | e3cc16e9fba045b3d195bc0e35dff4735bb6f59c (diff) |
Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"
Diffstat (limited to 'util')
-rw-r--r-- | util/qfloat16-tables/gen_qfloat16_tables.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/qfloat16-tables/gen_qfloat16_tables.cpp b/util/qfloat16-tables/gen_qfloat16_tables.cpp index faedb5073c..5d7bab01d2 100644 --- a/util/qfloat16-tables/gen_qfloat16_tables.cpp +++ b/util/qfloat16-tables/gen_qfloat16_tables.cpp @@ -80,7 +80,7 @@ int main() printf("#include <QtCore/qfloat16.h>\n\n"); printf("QT_BEGIN_NAMESPACE\n\n"); - printf("#if !defined(__F16C__) && !defined(__ARM_FP16_FORMAT_IEEE)\n\n"); + printf("#if !defined(__ARM_FP16_FORMAT_IEEE)\n\n"); printf("const quint32 qfloat16::mantissatable[2048] = {\n"); printf("0,\n"); @@ -157,7 +157,7 @@ int main() printf("};\n\n"); - printf("#endif // !__F16C__ && !__ARM_FP16_FORMAT_IEEE\n\n"); + printf("#endif // !__ARM_FP16_FORMAT_IEEE\n\n"); printf("QT_END_NAMESPACE\n"); return 0; } |