Fix compiling without QtWebKit

This makes it possible to compile QGIS master for Android. Hooray!
qgis · May 22, 2015 · 6952a38 · 6952a38
1 parent 6075442
commit 6952a38
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 143 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -79,6 +79,7 @@
 #include <QPainter>
 #include <QPixmap>
 #include <QPrintDialog>
+#include <QPrinter>
 #include <QSettings>
 #include <QSizeGrip>
 #include <QSvgGenerator>

diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -51,6 +51,7 @@ class QUndoView;
 class QComboBox;
 class QLabel;
 class QTreeView;
+class QPrinter;
 
 /** \ingroup MapComposer
  * \brief A gui for composing a printable map.

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -291,13 +291,6 @@ SET(QGIS_CORE_SRCS
   raster/qgshuesaturationfilter.cpp
 )
 
-IF (NOT WITH_QTWEBKIT)
-  SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
-    qgswebpage.cpp
-    qgswebframe.cpp
-  )
-ENDIF(NOT WITH_QTWEBKIT)
-
 IF(ENABLE_MODELTEST)
   SET(MODELTEST_SRCS
     ../../tests/qt_modeltest/modeltest.cpp

diff --git a/src/core/qgswebframe.cpp b/src/core/qgswebframe.cpp
diff --git a/src/core/qgswebpage.cpp b/src/core/qgswebpage.cpp
diff --git a/src/core/qgswebpage.h b/src/core/qgswebpage.h
@@ -144,7 +144,10 @@ class QWebPage : public QObject
       Q_UNUSED( size );
     }
 
-    void setLinkDelegationPolicy( LinkDelegationPolicy );
+    void setLinkDelegationPolicy( LinkDelegationPolicy linkDelegationPolicy )
+    {
+      Q_UNUSED( linkDelegationPolicy );
+    }
 
     void setNetworkAccessManager( QNetworkAccessManager* networkAccessManager )
     {