diff options
author | Samuel Gaist <samuel.gaist@idiap.ch> | 2020-07-24 11:00:01 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-08-17 20:35:12 +0000 |
commit | b7b0602d8b17aa7cf6de543a2e872c8edd6bcf18 (patch) | |
tree | a679457114b46d1d7bff58db8f02e10b0198d9fb | |
parent | 9380c33a718d475007d3f2955349d336267f274e (diff) | |
download | qtwayland-b7b0602d8b17aa7cf6de543a2e872c8edd6bcf18.tar.gz |
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: I661d9b6f8a956a33b301fe58add5910d6de293f1
Reviewed-by: David Edmundson <davidedmundson@kde.org>
(cherry picked from commit 396444d657e44cc9fae03b1dc053d521501cda00)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | src/3rdparty/protocol/qt_attribution.json | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/3rdparty/protocol/qt_attribution.json b/src/3rdparty/protocol/qt_attribution.json index 87f24227..816e0c63 100644 --- a/src/3rdparty/protocol/qt_attribution.json +++ b/src/3rdparty/protocol/qt_attribution.json @@ -13,9 +13,7 @@ "LicenseId": "MIT", "License": "MIT License", "LicenseFile": "MIT_LICENSE.txt", - "Copyright": "Copyright © 2016 Yong Bakos -Copyright © 2015 Jason Ekstrand -Copyright © 2015 Jonas Ådahl" + "Copyright": "Copyright © 2016 Yong Bakos\nCopyright © 2015 Jason Ekstrand\nCopyright © 2015 Jonas Ådahl" }, { @@ -32,9 +30,7 @@ Copyright © 2015 Jonas Ådahl" "LicenseId": "MIT", "License": "MIT License", "LicenseFile": "MIT_LICENSE.txt", - "Copyright": "Copyright © 2008-2011 Kristian Høgsberg -Copyright © 2010-2011 Intel Corporation -Copyright © 2012-2013 Collabora, Ltd." + "Copyright": "Copyright © 2008-2011 Kristian Høgsberg\nCopyright © 2010-2011 Intel Corporation\nCopyright © 2012-2013 Collabora, Ltd." }, { @@ -51,8 +47,7 @@ Copyright © 2012-2013 Collabora, Ltd." "LicenseId": "MIT", "License": "MIT License", "LicenseFile": "MIT_LICENSE.txt", - "Copyright": "Copyright (C) 2013 DENSO CORPORATION -Copyright (c) 2013 BMW Car IT GmbH" + "Copyright": "Copyright (C) 2013 DENSO CORPORATION\nCopyright (c) 2013 BMW Car IT GmbH" }, { @@ -103,8 +98,7 @@ Copyright (c) 2013 BMW Car IT GmbH" "LicenseId": "MIT", "License": "MIT License", "LicenseFile": "MIT_LICENSE.txt", - "Copyright": "Copyright 2014 © Stephen \"Lyude\" Chandler Paul -Copyright 2015-2016 © Red Hat, Inc." + "Copyright": "Copyright 2014 © Stephen \"Lyude\" Chandler Paul\nCopyright 2015-2016 © Red Hat, Inc." }, { @@ -172,13 +166,7 @@ Copyright 2015-2016 © Red Hat, Inc." "LicenseId": "MIT", "License": "MIT License", "LicenseFile": "MIT_LICENSE.txt", - "Copyright": "Copyright © 2008-2013 Kristian Høgsberg -Copyright © 2013 Rafael Antognolli -Copyright © 2013 Jasper St. Pierre -Copyright © 2010-2013 Intel Corporation -Copyright © 2015-2017 Samsung Electronics Co., Ltd -Copyright © 2015-2017 Red Hat Inc. -" + "Copyright": "Copyright © 2008-2013 Kristian Høgsberg\nCopyright © 2013 Rafael Antognolli\nCopyright © 2013 Jasper St. Pierre\nCopyright © 2010-2013 Intel Corporation\nCopyright © 2015-2017 Samsung Electronics Co., Ltd\nCopyright © 2015-2017 Red Hat Inc.\n" }, { @@ -194,8 +182,7 @@ Copyright © 2015-2017 Red Hat Inc. "LicenseId": "HPND", "License": "HPND License", "LicenseFile": "HPND_LICENSE.txt", - "Copyright": "Copyright © 2012, 2013 Intel Corporation -Copyright © 2015, 2016 Jan Arne Petersen" + "Copyright": "Copyright © 2012, 2013 Intel Corporation\nCopyright © 2015, 2016 Jan Arne Petersen" }, { |