summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Gaist <samuel.gaist@idiap.ch>2020-07-24 10:57:25 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-08-28 08:19:54 +0000
commitd4e82a2936f412fadbfefa240baeed6efd310a62 (patch)
treeded9aec56f8eb82ccc1091319ba0db2ff8a06492
parente02d4e57e19fb4b973bf736658fde82959d93ca9 (diff)
Fix qt_attribution.json files by replacing newlines with \n escapes
In their current state theses files contains invalid json. While they are parsed successfully by qtattributionsscanner, they cannot be loaded by libraries such as Python's json module. This patch fixes this. The output generated by qtattributionsscanner stays the same. Change-Id: I4692a8e99a492c401d42320beacbc103c6a61319 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 0fda7edeb8abeddf8391cc4aa8fd4c03add01ccf) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/3rdparty/libtiff/qt_attribution.json3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/qt_attribution.json b/src/3rdparty/libtiff/qt_attribution.json
index d51ee4a..283f5e6 100644
--- a/src/3rdparty/libtiff/qt_attribution.json
+++ b/src/3rdparty/libtiff/qt_attribution.json
@@ -10,6 +10,5 @@
"License": "libtiff License",
"LicenseId": "libtiff",
"LicenseFile": "COPYRIGHT",
- "Copyright": "Copyright (c) 1988-1997 Sam Leffler
-Copyright (c) 1991-1997 Silicon Graphics, Inc."
+ "Copyright": "Copyright (c) 1988-1997 Sam Leffler\nCopyright (c) 1991-1997 Silicon Graphics, Inc."
}