Add qInfo macros link for Qt4, add url output for network error

sergey-dryabzhinsky · Oct 5, 2020 · aa6a33c · aa6a33c
1 parent 777df67
commit aa6a33c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -41,6 +41,7 @@
 
 #include <QDebug>
 #include "config.h"
+#include "qinfo.h"
 #include "mainwindow.h"
 #include "qwk_webpage.h"
 

diff --git a/src/qinfo.h b/src/qinfo.h
@@ -0,0 +1,15 @@
+/**
+ * Add debug macros for QT < 5.5.0
+ */
+
+#ifndef __QINFO_H
+#define __QINFO_H
+
+#if QT_VERSION < 0x050500
+#define qInfo       qDebug
+#define qWarning    qDebug
+#define qFatal      qDebug
+#define qCritical   qDebug
+#endif
+
+#endif
diff --git a/src/qwk_webpage.cpp b/src/qwk_webpage.cpp
@@ -7,6 +7,8 @@
 #include "config.h"
 
 #include <QtDebug>
+#include "qinfo.h"
+
 #include <QtGui>
 #include <QtWebKit>
 #include "webview.h"

diff --git a/src/webview.cpp b/src/webview.cpp
@@ -160,11 +160,12 @@ void WebView::handleSslErrors(QNetworkReply* reply, const QList<QSslError> &erro
 
 void WebView::handleNetworkReply(QNetworkReply* reply)
 {
-    if( reply ) {
+    if ( reply ) {
         qDebug() << QDateTime::currentDateTime().toString() << "handleNetworkReply URL:" << reply->request().url().toString();
         if( reply->error()) {
             QString errStr = reply->errorString();
             qWarning() << QDateTime::currentDateTime().toString() << "handleNetworkReply ERROR:" << reply->error() << "=" << errStr;
+            qWarning() << QDateTime::currentDateTime().toString() << "on URL:" << reply->request().url().toString();
             emit qwkNetworkError(reply->error(), reply->errorString());
         } else {
             qDebug() << QDateTime::currentDateTime().toString() << "handleNetworkReply OK";