Skip to content
Permalink
Browse files

Fix compiling without QtWebKit

This makes it possible to compile QGIS master for Android.
Hooray!
  • Loading branch information
m-kuhn committed May 22, 2015
1 parent 6075442 commit 6952a389ea3159eda0bb78cc31c0b2d9999e8d79
@@ -79,6 +79,7 @@
#include <QPainter>
#include <QPixmap>
#include <QPrintDialog>
#include <QPrinter>
#include <QSettings>
#include <QSizeGrip>
#include <QSvgGenerator>
@@ -51,6 +51,7 @@ class QUndoView;
class QComboBox;
class QLabel;
class QTreeView;
class QPrinter;

/** \ingroup MapComposer
* \brief A gui for composing a printable map.
@@ -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

This file was deleted.

This file was deleted.

@@ -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 )
{

0 comments on commit 6952a38

Please sign in to comment.
You can’t perform that action at this time.