Merge tag 'upstream/2.5.2'

[minitube] / src / networkaccess.cpp

diff --git a/src/networkaccess.cpp b/src/networkaccess.cpp
index ea8b557b9d339a82d7582d6bd43bb72f419b1066..9b279800c51cda660b206ee0b6f3e78959242bb2 100644 (file)
--- a/src/networkaccess.cpp
+++ b/src/networkaccess.cpp
@@ -21,6 +21,9 @@ $END_LICENSE */
 #include "networkaccess.h"
 #include "constants.h"
 #include <QtGui>
+#if QT_VERSION >= 0x050000
+#include <QtWidgets>
+#endif
 
 namespace The {
 NetworkAccess* http();
@@ -32,7 +35,7 @@ const QString USER_AGENT = QString(Constants::NAME)
                            + " (" + Constants::WEBSITE + ")";
 */
 
-const QString USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.65 Safari/537.36";
+const QString USER_AGENT = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.85 Safari/537.36";
 
 NetworkReply::NetworkReply(QNetworkReply *networkReply) :
     QObject(networkReply),
@@ -71,7 +74,7 @@ void NetworkReply::finished() {
             setupReply();
             readTimeoutTimer->start();
             return;
-        } else qWarning() << "Redirection not supported" << networkReply->url().toEncoded();
+        } else qDebug() << "Redirection not supported" << networkReply->url().toEncoded();
     }
 
     if (receivers(SIGNAL(data(QByteArray))) > 0)
@@ -171,6 +174,9 @@ QNetworkReply* NetworkAccess::request(QUrl url, int operation, const QByteArray&
         return 0;
     }
 
+#ifdef APP_MAC
+    networkReply->ignoreSslErrors();
+#endif
     return networkReply;
 }