diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:04:29 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-28 03:04:29 +0200 |
| commit | fadd3877b7c5cbd20aa053e99e0d7cae3a58b8c6 (patch) | |
| tree | d1c8f12c5ce14ccea2387f69b9a6eac8d34e2d9f | |
| parent | 8dac7bc470abcd38e6cafc54a79ec1b06249c6ed (diff) | |
| parent | ac8a82f5ffd08b0b9f8f76be29158ce7e113cb46 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Id1a3c32e1310d4cc0ac0ba7bb74199e285db9c5d
| -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": [ |