Require Qt 5.6 or higher

3rdparty/singleapplication/singleapplication_p.cpp

@@ -214,9 +214,7 @@ void SingleApplicationPrivate::connectToPrimary(int msecs, ConnectionType connec
     QByteArray initMsg;
     QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     writeStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
     writeStream << blockServerName.toLatin1();
     writeStream << static_cast<quint8>(connectionType);
@@ -228,9 +226,8 @@ void SingleApplicationPrivate::connectToPrimary(int msecs, ConnectionType connec
     QByteArray header;
     QDataStream headerStream(&header, QIODevice::WriteOnly);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
+
     headerStream << static_cast <quint64>(initMsg.length());
 
     socket->write(header);
@@ -315,9 +312,7 @@ void SingleApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
 
   QDataStream headerStream(sock);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
   // Read the header to know the message length
   quint64 msgLen = 0;
@@ -349,9 +344,7 @@ void SingleApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   QByteArray msgBytes = sock->read(info.msgLen);
   QDataStream readStream(msgBytes);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   readStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
   // server name
   QByteArray latin1Name;

3rdparty/singleapplication/singlecoreapplication_p.cpp

@@ -214,9 +214,7 @@ void SingleCoreApplicationPrivate::connectToPrimary(int msecs, ConnectionType co
     QByteArray initMsg;
     QDataStream writeStream(&initMsg, QIODevice::WriteOnly);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     writeStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
     writeStream << blockServerName.toLatin1();
     writeStream << static_cast<quint8>(connectionType);
@@ -228,9 +226,8 @@ void SingleCoreApplicationPrivate::connectToPrimary(int msecs, ConnectionType co
     QByteArray header;
     QDataStream headerStream(&header, QIODevice::WriteOnly);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
+
     headerStream << static_cast <quint64>(initMsg.length());
 
     socket->write(header);
@@ -315,9 +312,7 @@ void SingleCoreApplicationPrivate::readInitMessageHeader(QLocalSocket *sock) {
 
   QDataStream headerStream(sock);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   headerStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
   // Read the header to know the message length
   quint64 msgLen = 0;
@@ -349,9 +344,7 @@ void SingleCoreApplicationPrivate::readInitMessageBody(QLocalSocket *sock) {
   QByteArray msgBytes = sock->read(info.msgLen);
   QDataStream readStream(msgBytes);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   readStream.setVersion(QDataStream::Qt_5_6);
-#endif
 
   // server name
   QByteArray latin1Name;

CMakeLists.txt

@@ -108,7 +108,7 @@ find_package(Gettext)
 find_package(FFTW3)
 
 # QT
-set(QT_MIN_VERSION 5.5)
+set(QT_MIN_VERSION 5.6)
 set(QT_COMPONENTS Core Concurrent Widgets Network Sql)
 
 if(X11_FOUND)

src/core/network.cpp

@@ -127,10 +127,7 @@ QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkR
   }
 
   QNetworkRequest new_request(request);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   new_request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
-
   new_request.setRawHeader("User-Agent", user_agent);
 
   if (op == QNetworkAccessManager::PostOperation && !new_request.header(QNetworkRequest::ContentTypeHeader).isValid()) {

src/covermanager/albumcoverfetchersearch.cpp

@@ -181,9 +181,7 @@ void AlbumCoverFetcherSearch::FetchMoreImages() {
     qLog(Debug) << "Loading" << result.image_url << "from" << result.provider;
 
     QNetworkRequest req(result.image_url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
     QNetworkReply *image_reply = network_->get(req);
     NewClosure(image_reply, SIGNAL(finished()), this, SLOT(ProviderCoverFetchFinished(QNetworkReply*)), image_reply);
     pending_image_loads_[image_reply] = result;

src/covermanager/deezercoverprovider.cpp

@@ -71,9 +71,7 @@ bool DeezerCoverProvider::StartSearch(const QString &artist, const QString &albu
   QUrl url(kApiUrl + QString("/search/album"));
   url.setQuery(url_query);
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network_->get(req);
 
   NewClosure(reply, SIGNAL(finished()), this, SLOT(HandleSearchReply(QNetworkReply*, int)), reply, id);

src/covermanager/discogscoverprovider.cpp

@@ -138,9 +138,7 @@ void DiscogsCoverProvider::SendSearchRequest(DiscogsCoverSearchContext *s_ctx) {
   url_query.addQueryItem("Signature", QUrl::toPercentEncoding(signature.toBase64()));
 
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network_->get(req);
   NewClosure(reply, SIGNAL(finished()), this, SLOT(HandleSearchReply(QNetworkReply*, int)), reply, s_ctx->id);
 
@@ -177,9 +175,7 @@ void DiscogsCoverProvider::SendReleaseRequest(DiscogsCoverSearchContext *s_ctx,
   url.setQuery(url_query);
 
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network_->get(req);
   NewClosure(reply, SIGNAL(finished()), this, SLOT(HandleReleaseReply(QNetworkReply*, int, int)), reply, s_ctx->id, r_ctx->id);
 

src/covermanager/lastfmcoverprovider.cpp

@@ -83,9 +83,7 @@ bool LastFmCoverProvider::StartSearch(const QString &artist, const QString &albu
 
   QUrl url(kUrl);
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
   QNetworkReply *reply = network_->post(req, url_query.toString(QUrl::FullyEncoded).toUtf8());
   NewClosure(reply, SIGNAL(finished()), this, SLOT(QueryFinished(QNetworkReply*, int)), reply, id);

src/covermanager/musicbrainzcoverprovider.cpp

@@ -61,9 +61,7 @@ bool MusicbrainzCoverProvider::StartSearch(const QString &artist, const QString
   QUrl url(kReleaseSearchUrl);
   url.setQuery(url_query);
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network_->get(req);
   NewClosure(reply, SIGNAL(finished()), this, SLOT(HandleSearchReply(QNetworkReply *, int)), reply, id);
 

src/lyrics/auddlyricsprovider.cpp

@@ -64,9 +64,7 @@ bool AuddLyricsProvider::StartSearch(const QString &artist, const QString &album
   QUrl url(kUrlSearch);
   url.setQuery(url_query);
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network_->get(req);
   NewClosure(reply, SIGNAL(finished()), this, SLOT(HandleSearchReply(QNetworkReply*, const quint64, const QString&, const QString&)), reply, id, artist, title);
 

src/lyrics/lololyricsprovider.cpp

@@ -59,9 +59,7 @@ bool LoloLyricsProvider::StartSearch(const QString &artist, const QString &album
   QUrl url(kUrlSearch);
   url.setQuery(url_query);
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network_->get(req);
   NewClosure(reply, SIGNAL(finished()), this, SLOT(HandleSearchReply(QNetworkReply*, const quint64, const QString&, const QString&)), reply, id, artist, title);
 

src/lyrics/ovhlyricsprovider.cpp

@@ -47,9 +47,7 @@ bool OVHLyricsProvider::StartSearch(const QString &artist, const QString &album,
 
   QUrl url(kUrlSearch + QString(QUrl::toPercentEncoding(artist)) + "/" + QString(QUrl::toPercentEncoding(title)));
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network_->get(req);
   NewClosure(reply, SIGNAL(finished()), this, SLOT(HandleSearchReply(QNetworkReply*, const quint64, const QString&, const QString&)), reply, id, artist, title);
 

src/musicbrainz/acoustidclient.cpp

@@ -79,9 +79,7 @@ void AcoustidClient::Start(const int id, const QString &fingerprint, int duratio
   url.setQuery(url_query);
 
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network_->get(req);
   NewClosure(reply, SIGNAL(finished()), this, SLOT(RequestFinished(QNetworkReply*, int)), reply, id);
   requests_[id] = reply;

src/musicbrainz/musicbrainzclient.cpp

@@ -158,9 +158,7 @@ void MusicBrainzClient::StartDiscIdRequest(const QString &discid) {
   url.setQuery(url_query);
 
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network_->get(req);
   NewClosure(reply, SIGNAL(finished()), this, SLOT(DiscIdRequestFinished(const QString&, QNetworkReply*)), discid, reply);
 
@@ -182,9 +180,7 @@ void MusicBrainzClient::FlushRequests() {
   url.setQuery(url_query);
 
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network_->get(req);
   NewClosure(reply, SIGNAL(finished()), this, SLOT(RequestFinished(QNetworkReply*, const int, const int)), reply, request.id, request.number);
   requests_.insert(request.id, reply);

src/scrobbler/listenbrainzscrobbler.cpp

@@ -194,9 +194,7 @@ void ListenBrainzScrobbler::RequestSession(const QUrl &url, const QString &token
   url_query.addQueryItem("redirect_uri", url.toString());
 
   QNetworkRequest req(session_url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
   QByteArray query = url_query.toString(QUrl::FullyEncoded).toUtf8();
   QNetworkReply *reply = network_->post(req, query);
@@ -284,9 +282,7 @@ void ListenBrainzScrobbler::AuthenticateReplyFinished(QNetworkReply *reply) {
 QNetworkReply *ListenBrainzScrobbler::CreateRequest(const QUrl &url, const QJsonDocument &json_doc) {
 
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
   req.setRawHeader("Authorization", QString("Token %1").arg(user_token_).toUtf8());
   QNetworkReply *reply = network_->post(req, json_doc.toJson());

src/scrobbler/scrobblingapi20.cpp

@@ -228,9 +228,7 @@ void ScrobblingAPI20::RequestSession(const QString &token) {
   session_url.setQuery(session_url_query);
 
   QNetworkRequest req(session_url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   QNetworkReply *reply = network()->get(req);
   NewClosure(reply, SIGNAL(finished()), this, SLOT(AuthenticateReplyFinished(QNetworkReply*)), reply);
 
@@ -358,9 +356,7 @@ QNetworkReply *ScrobblingAPI20::CreateRequest(const ParamList &request_params) {
 
   QUrl url(api_url_);
   QNetworkRequest req(url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
   req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
   QByteArray query = url_query.toString(QUrl::FullyEncoded).toUtf8();
   QNetworkReply *reply = network()->post(req, query);

src/subsonic/subsonicbaserequest.cpp

@@ -96,9 +96,7 @@ QNetworkReply *SubsonicBaseRequest::CreateGetRequest(const QString &ressource_na
   }
 
   req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
   req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
 
   QNetworkReply *reply = network_->get(req);
   connect(reply, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(HandleSSLErrors(QList<QSslError>)));

src/subsonic/subsonicrequest.cpp

@@ -656,9 +656,7 @@ void SubsonicRequest::FlushAlbumCoverRequests() {
     ++album_covers_requests_active_;
 
     QNetworkRequest req(request.url);
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
 
     if (!verify_certificate()) {
       QSslConfiguration sslconfig = QSslConfiguration::defaultConfiguration();

src/widgets/stretchheaderview.cpp

@@ -247,12 +247,7 @@ void StretchHeaderView::SetColumnWidth(int logical, ColumnWidthType width) {
 bool StretchHeaderView::RestoreState(const QByteArray& data) {
 
   QDataStream s(data);
-
-#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
-  s.setVersion(QDataStream::Qt_5_5);
-#else
   s.setVersion(QDataStream::Qt_5_6);
-#endif
 
   int magic_number = 0;
   s >> magic_number;
@@ -316,11 +311,7 @@ QByteArray StretchHeaderView::SaveState() const {
     visual_indices << logicalIndex(i);
   }
 
-#if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
-  s.setVersion(QDataStream::Qt_5_5);
-#else
   s.setVersion(QDataStream::Qt_5_6);
-#endif
 
   s << kMagicNumber;