diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:00:57 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:00:57 +0200 |
| commit | adfb3abcfaaf80959b38ef753cfd2516e2742603 (patch) | |
| tree | 81ba8f1b946a8ae9cd52f08f3b97633cfd9fda13 | |
| parent | 9ed4a9769ab6e024811d7d81b3bd9e2470247aae (diff) | |
| parent | e0d64f71299572c60affaf67b208f6ab5aa1f9b0 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia70c3f78bf0801363b757e164bd66767fb77f9a2
| -rw-r--r-- | src/imageformats/configure.json | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json index 4724d86..3b38fae 100644 --- a/src/imageformats/configure.json +++ b/src/imageformats/configure.json @@ -22,10 +22,15 @@ "string.h", "jasper/jasper.h" ], + "head": [ + "constexpr bool streq(const char *a, const char *b)", + "{", + " return a[0] == b[0] && (!a[0] || streq(a + 1, b + 1));", + "}" + ], "main": [ - "// This version of Jasper is broken, according to the old Qt Solutions docs", - "if (strcmp(JAS_VERSION, \"1.900.0\") == 0)", - " return 1;" + "static_assert(!streq(JAS_VERSION, \"1.900.0\"),", + " \"JasPer version 1.900.0 is considered broken.\");" ] }, "sources": [ |