Skip to content

Commit

Permalink
Fix musescore#7971: Help > MusicXML Links to contributor licenses rat…
Browse files Browse the repository at this point in the history
…her than end-user licenses

Fixes issue musescore#7971 for the 3.x branch, backport of musescore#7978, resp. duplicate
of musescore#7979
  • Loading branch information
Jojo-Schmitz committed Aug 13, 2021
1 parent ce2f18f commit 5f28e24
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
7 changes: 3 additions & 4 deletions mscore/aboutmusicxmlbox.ui
Expand Up @@ -20,14 +20,13 @@ p, li { white-space: pre-wrap; }
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:10pt;">supported by many applications.</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Copyright © 2004-2017 the Contributors to the MusicXML</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Specification, published by the W3C Music Notation Community</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Group under the W3C Community Contributor License Agreement</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">(CLA):</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Group under the W3C Community Final Specification Agreement:</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;"> </span><a href="https://www.w3.org/community/about/agreements/cla/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">https://www.w3.org/community/about/agreements/cla/</span></a></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;"> </span><a href="https://www.w3.org/community/about/process/final/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">https://www.w3.org/community/about/process/final/</span></a></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">A human-readable summary is available:</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;"> </span><a href="https://www.w3.org/community/about/agreements/cla-deed/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">https://www.w3.org/community/about/agreements/cla-deed/</span></a></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;"> </span><a href="https://www.w3.org/community/about/process/fsa-deed/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">https://www.w3.org/community/about/process/fsa-deed/</span></a></p>
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
Expand Down
7 changes: 3 additions & 4 deletions mscore/musescoredialogs.cpp
Expand Up @@ -197,11 +197,10 @@ AboutMusicXMLBoxDialog::AboutMusicXMLBoxDialog()
"supported by many applications.\n"
"Copyright © 2004-2017 the Contributors to the MusicXML\n"
"Specification, published by the W3C Music Notation Community\n"
"Group under the W3C Community Contributor License Agreement\n"
"(CLA):\n%1\n"
"Group under the W3C Community Final Specification Agreement:\n%1\n"
"A human-readable summary is available:\n%2")
.arg( "\n&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"https://www.w3.org/community/about/agreements/cla/\">https://www.w3.org/community/about/agreements/cla/</a>\n",
"\n&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"https://www.w3.org/community/about/agreements/cla-deed/\">https://www.w3.org/community/about/agreements/cla-deed/</a>\n")
.arg( "\n&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"https://www.w3.org/community/about/process/final/\">https://www.w3.org/community/about/process/final/</a>\n",
"\n&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"https://www.w3.org/community/about/process/fsa-deed/\">https://www.w3.org/community/about/process/fsa-deed/</a>\n")
.replace("\n","<br/>")));
}

Expand Down

0 comments on commit 5f28e24

Please sign in to comment.