diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-10-21 19:46:36 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2011-10-21 19:46:36 +0000 |
commit | e28f8225f5ba270f840b6eb5c0253a0ec50de4b7 (patch) | |
tree | 6c2755007bc45f96e12bef9036cbf19905a66891 /rbutil/rbutilqt/rbutilqt.cpp | |
parent | eb97426c76a0716fbc26e0581ccaaad2426d5c04 (diff) | |
download | rockbox-e28f8225f5ba270f840b6eb5c0253a0ec50de4b7.tar.gz rockbox-e28f8225f5ba270f840b6eb5c0253a0ec50de4b7.zip |
Rockbox Utility: add Speex license to About dialog.
The Speex codec has a special license requiring it to be reproduced with any
distribution. Add the license as a separate tab in the About dialog to satisfy
this.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30816 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.cpp b/rbutil/rbutilqt/rbutilqt.cpp index 47955c93fc..70b7e5fa47 100644 --- a/rbutil/rbutilqt/rbutilqt.cpp +++ b/rbutil/rbutilqt/rbutilqt.cpp | |||
@@ -293,9 +293,15 @@ void RbUtilQt::about() | |||
293 | QFile licence(":/docs/gpl-2.0.html"); | 293 | QFile licence(":/docs/gpl-2.0.html"); |
294 | licence.open(QIODevice::ReadOnly); | 294 | licence.open(QIODevice::ReadOnly); |
295 | QTextStream c(&licence); | 295 | QTextStream c(&licence); |
296 | QString cline = c.readAll(); | 296 | about.browserLicense->insertHtml(c.readAll()); |
297 | about.browserLicense->insertHtml(cline); | ||
298 | about.browserLicense->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); | 297 | about.browserLicense->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); |
298 | |||
299 | QFile speexlicense(":/docs/COPYING.SPEEX"); | ||
300 | speexlicense.open(QIODevice::ReadOnly); | ||
301 | QTextStream s(&speexlicense); | ||
302 | about.browserSpeexLicense->insertHtml("<pre>" + s.readAll() + "</pre>"); | ||
303 | about.browserSpeexLicense->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor); | ||
304 | |||
299 | QFile credits(":/docs/CREDITS"); | 305 | QFile credits(":/docs/CREDITS"); |
300 | credits.open(QIODevice::ReadOnly); | 306 | credits.open(QIODevice::ReadOnly); |
301 | QTextStream r(&credits); | 307 | QTextStream r(&credits); |