Merge pull request #6276 from jonaski/qt5-update

Update Qt 5 branch

ext/libclementine-remote/remotecontrolmessages.proto

@@ -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

ext/libclementine-spotifyblob/spotifymessages.proto

@@ -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;
 

ext/libclementine-tagreader/tagreadermessages.proto

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

src/ui/about.cpp

@@ -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());