diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-08 09:11:01 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-08 09:11:02 +0100 |
commit | 78c687f98eabb3da00026ac2375cdb4bb5770a0a (patch) | |
tree | 0bd20a65aa9051229e813bc6b09cb59f8b5778f1 /util | |
parent | 3e529369eb16704aa0d601a7f4b8e490dc8b772c (diff) | |
parent | a866055d18b2c2efc0f3cf5307d8eac78cce26eb (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I963b5f48b5d6f3500ca379fbd7f1a4290b570175
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; } |