Merge pull request #6276 from jonaski/qt5-update

Update Qt 5 branch
This commit is contained in:
John Maguire 2019-01-27 20:26:35 +00:00 committed by GitHub
commit 610566d252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 1 deletions

View File

@ -18,6 +18,8 @@
// Note: this file is licensed under the Apache License instead of GPL, so
// 3rd party applications or libraries can use another license besides GPL.
syntax = "proto2";
package pb.remote;
// The supported message types

View File

@ -18,6 +18,7 @@
// it is used by the Spotify blob which links against libspotify and is not GPL
// compatible.
syntax = "proto2";
package pb.spotify;

View File

@ -1,3 +1,5 @@
syntax = "proto2";
package pb.tagreader;
message SongMetadata {

View File

@ -53,7 +53,10 @@ About::About(QWidget* parent) : QDialog(parent) {
<< Person("Alexander Peitz")
<< Person("Artur Rona", "artur.rona@gmail.com")
<< Person("Andreas Muttscheller", "asfa194@gmail.com")
<< Person("Mark Furneaux", "mark@furneaux.ca");
<< Person("Mark Furneaux", "mark@furneaux.ca")
<< Person("Mattias Andersson", "mandersson444@gmail.com")
<< Person("Vikram Ambrose", "ambroseworks@gmail.com")
<< Person("Jonas Kvinge", "jonas@jkvinge.net");
std::sort(authors_.begin(), authors_.end());
std::sort(thanks_to_.begin(), thanks_to_.end());