Details
-
Bug
-
Resolution: Fixed
-
P3: Somewhat important
-
None
-
6.5.0 Beta3
-
None
-
-
687bbd584 (dev), b0bb1bf33 (6.6), e004cebd1 (6.5), a345c01d6 (dev), c0f13eeb9 (dev), 71ce3b81f (dev), 4319a9ed8 (dev), b30a986ed (6.6), 6fdd7d921 (6.6), 9b57368a7 (6.6), 6dffa72ba (tqtc/lts-6.5), f0c40a2d6 (tqtc/lts-6.5), 874e5be7f (6.6), 80a24bb47 (dev)
Description
The qt_attributions.json files are currently invalid JSON, because of entries like this:
"Copyright": "Copyright (c) 1995-2022 The PNG Reference Library Authors Copyright (c) 2000-2022 Cosmin Truta ... Copyright (c) 1995-1996 Tim Wegner"
The newlines must be replaced by \n or the Copyright field should be allowed to be an array of strings.
Patch that goes the \n route: https://codereview.qt-project.org/c/qt/qtbase/+/308531
However, it turns out that this results in quite unreadable, overly long string literals.
Let's do it like this:
- change QUIP 007 and state that the Copyright field allows string or string[].
- change qtattributionsscanner to accept string arrays. The array is joined to a single string with newlines.
- bulk-change the qt_attribution.json files
Attachments
For Gerrit Dashboard: QTBUG-111873 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
500986,3 | Change qtattributionsscanner to accept string arrays for Copyright | dev | qt/qttools | Status: MERGED | +2 | 0 |
500993,10 | Update the accepted format for copyright | master | meta/quips | Status: MERGED | +2 | 0 |
501221,4 | Modify copyright format in qt_attribution.json | dev | qt/qtbase | Status: MERGED | +2 | 0 |
501222,4 | Modify copyright format in qt_attribution.son | dev | qt/qtdeclarative | Status: MERGED | +2 | 0 |
501915,2 | Modify copyright format in qt_attribution.json | dev | qt/qtquick3d | Status: MERGED | +2 | 0 |
501920,2 | Modify copyright format in qt_attribution.json | dev | qt/qtvirtualkeyboard | Status: MERGED | +2 | 0 |
501942,6 | Modify copyright format in qt_attribution.json | dev | qt/qtwebengine | Status: MERGED | -1 | 0 |
503058,2 | Change qtattributionsscanner to accept string arrays for Copyright | 6.6 | qt/qttools | Status: MERGED | +2 | 0 |
503059,2 | Change qtattributionsscanner to accept string arrays for Copyright | 6.5 | qt/qttools | Status: MERGED | +2 | 0 |
512393,2 | coin: Update provisioned qdoc, qtattributionsscanner binaries | dev | qt/qt5 | Status: MERGED | +2 | 0 |
513608,4 | coin: Update provisioned qdoc, qtattributionsscanner binaries | 6.6 | qt/qt5 | Status: MERGED | +2 | 0 |
513675,2 | Modify copyright format in qt_attribution.json | 6.6 | qt/qtbase | Status: MERGED | +2 | 0 |
514354,2 | Modify copyright format in qt_attribution.json | 6.6 | qt/qtvirtualkeyboard | Status: MERGED | +2 | 0 |
514360,2 | Modify copyright format in qt_attribution.json | 6.6 | qt/qtquick3d | Status: MERGED | +2 | 0 |
514461,2 | coin: Update provisioned qdoc, qtattributionsscanner binaries | tqtc/lts-6.5 | qt/tqtc-qt5 | Status: MERGED | +2 | 0 |
514510,2 | Modify copyright format in qt_attribution.json | tqtc/lts-6.5 | qt/tqtc-qtvirtualkeyboard | Status: MERGED | +2 | 0 |
514511,2 | Modify copyright format in qt_attribution.json | tqtc/lts-6.5 | qt/tqtc-qtquick3d | Status: MERGED | +2 | 0 |
517670,2 | Modify copyright format in qt_attribution.json | tqtc/lts-6.5 | qt/tqtc-qtbase | Status: MERGED | +2 | 0 |
520610,2 | Modify copyright format in qt_attribution.json | 6.6 | qt/qtwebengine | Status: MERGED | +2 | 0 |
521909,2 | Modify copyright format in qt_attribution.son | 6.6 | qt/qtdeclarative | Status: MERGED | +2 | 0 |
522045,2 | Modify copyright format in qt_attribution.son | tqtc/lts-6.5 | qt/tqtc-qtdeclarative | Status: MERGED | +2 | 0 |
525531,2 | Modify copyright format in qt_attribution.json | 6.5 | qt/qtwebengine | Status: MERGED | +2 | 0 |