fix building without Qt Webkit

also Qt5 connect style
qgis · Apr 4, 2017 · 27d5bbb · 27d5bbb
1 parent f23ed3a
commit 27d5bbb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/core/qgsmessagelog.cpp b/src/core/qgsmessagelog.cpp
@@ -47,7 +47,7 @@ void QgsMessageLog::emitMessage( const QString &message, const QString &tag, Qgs
 QgsMessageLogConsole::QgsMessageLogConsole()
   : QObject( QgsApplication::messageLog() )
 {
-  connect( QgsApplication::messageLog(),  static_cast < void ( QgsMessageLog::* )( const QString &, const QString &, QgsMessageLog::MessageLevel ) >( &QgsMessageLog::messageReceived ),
+  connect( QgsApplication::messageLog(), static_cast < void ( QgsMessageLog::* )( const QString &, const QString &, QgsMessageLog::MessageLevel ) >( &QgsMessageLog::messageReceived ),
            this, &QgsMessageLogConsole::logMessage );
 }
 

diff --git a/src/core/qgstransaction.cpp b/src/core/qgstransaction.cpp
@@ -110,7 +110,7 @@ bool QgsTransaction::addLayer( QgsVectorLayer *layer )
   }
 
   connect( this, &QgsTransaction::afterRollback, layer->dataProvider(), &QgsVectorDataProvider::dataChanged );
-  connect( QgsProject::instance(),  static_cast < void ( QgsProject::* )( const QStringList & ) >( &QgsProject::layersWillBeRemoved ), this, &QgsTransaction::onLayersDeleted );
+  connect( QgsProject::instance(), static_cast < void ( QgsProject::* )( const QStringList & ) >( &QgsProject::layersWillBeRemoved ), this, &QgsTransaction::onLayersDeleted );
   mLayers.insert( layer );
 
   if ( mTransactionActive )

diff --git a/src/core/qgswebpage.h b/src/core/qgswebpage.h
@@ -186,6 +186,10 @@ class CORE_EXPORT QWebPage : public QObject
 
     void loadFinished( bool ok );
 
+    void downloadRequested( const QNetworkRequest &request );
+
+    void unsupportedContent( QNetworkReply *reply );
+
   public slots:
 
   protected:

diff --git a/src/core/qgswebview.h b/src/core/qgswebview.h
@@ -47,8 +47,8 @@ class CORE_EXPORT QgsWebView : public QWebView
 #else
 #include "qgswebpage.h"
 #include <QTextBrowser>
-class QPrinter;
 
+class QPrinter;
 
 /** \ingroup core
  * \brief The QgsWebView class is a collection of stubs to mimic the API of QWebView on systems where the real
@@ -69,8 +69,8 @@ class CORE_EXPORT QgsWebView : public QTextBrowser
       , mSettings( new QWebSettings() )
       , mPage( new QWebPage( this ) )
     {
-      connect( this, SIGNAL( anchorClicked( const QUrl & ) ), this, SIGNAL( linkClicked( const QUrl & ) ) );
-      connect( this, SIGNAL( pageLoadFinished( bool ) ), mPage, SIGNAL( loadFinished( bool ) ) );
+      connect( this, &QTextBrowser::anchorClicked, this, &QgsWebView::linkClicked );
+      connect( this, &QgsWebView::pageLoadFinished, mPage, &QWebPage::loadFinished );
     }
 
     ~QgsWebView()