sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compiling without QtWebKit

Browse Source 
This makes it possible to compile QGIS master for Android.
Hooray!
This commit is contained in:
Matthias Kuhn 2015-05-22 11:48:02 +02:00
parent 6075442439
commit 6952a389ea
6 changed files with 6 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/composer/qgscomposer.cpp
View File

@ -79,6 +79,7 @@
#include <QPainter>
#include <QPixmap>
#include <QPrintDialog>
#include <QPrinter>
#include <QSettings>
#include <QSizeGrip>
#include <QSvgGenerator>

1
src/app/composer/qgscomposer.h
View File

@ -51,6 +51,7 @@ class QUndoView;
class QComboBox;
class QLabel;
class QTreeView;
class QPrinter;
/** \ingroup MapComposer
* \brief A gui for composing a printable map.

7
src/core/CMakeLists.txt
View File

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

52
src/core/qgswebframe.cpp
View File

@ -1,52 +0,0 @@
/***************************************************************************
----------------------------------------------------
date : 19.5.2015
copyright : (C) 2015 by Matthias Kuhn
email : matthias (at) opengis.ch
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "qgswebframe.h"
QWebFrame::QWebFrame()
{
}
void QWebFrame::setZoomFactor(qreal factor)
{
}
void QWebFrame::setScrollBarPolicy(Qt::Orientation, Qt::ScrollBarPolicy)
{
}
void QWebFrame::setHtml(const QString&, const QUrl)
{
}
QSize QWebFrame::contentsSize() const
{
}
void QWebFrame::render( QPainter*, const QRegion )
{
}
void QWebFrame::addToJavaScriptWindowObject(const QString&, QObject*)
{
}

83
src/core/qgswebpage.cpp
View File

@ -1,83 +0,0 @@
/***************************************************************************
----------------------------------------------------
date : 19.5.2015
copyright : (C) 2015 by Matthias Kuhn
email : matthias (at) opengis.ch
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#include "qgswebpage.h"
QWebSettings::QWebSettings(QObject* parent)
{
}
void QWebSettings::setUserStyleSheetUrl(const QUrl&)
{
}
void QWebSettings::setAttribute(QWebSettings::WebAttribute, bool on)
{
}
QWebPage::QWebPage(QObject* parent)
{
}
QPalette QWebPage::palette() const
{
}
void QWebPage::setPalette(const QPalette& palette)
{
}
void QWebPage::setViewportSize(const QSize& size) const
{
}
void QWebPage::setLinkDelegationPolicy(QWebPage::LinkDelegationPolicy)
{
}
void QWebPage::setNetworkAccessManager(QNetworkAccessManager* networkAccessManager)
{
}
QWebFrame*QWebPage::mainFrame() const
{
}
QWebSettings*QWebPage::settings() const
{
}
QSize QWebPage::viewportSize() const
{
}
QMenu*QWebPage::createStandardContextMenu()
{
}

5
src/core/qgswebpage.h
View File

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