| 23 |
23 |
#include <QObject>
|
| 24 |
24 |
|
| 25 |
25 |
#ifdef WITH_QTWEBKIT
|
| 26 |
|
#include <QWebPage>
|
|
26 |
#include <qwebpage.h>
|
| 27 |
27 |
#else
|
| 28 |
28 |
|
| 29 |
29 |
#include "qgswebframe.h"
|
| 30 |
|
-- qgis-3.2.0/src/core/qgswebframe.h.orig 2018-06-22 09:22:18.428210838 +0100
|
|
30 |
++ qgis-3.2.0/src/core/qgswebframe.h 2018-06-22 09:22:43.752211463 +0100
|
| ... | ... | |
| 21 |
21 |
#include "qgis_core.h"
|
| 22 |
22 |
|
| 23 |
23 |
#ifdef WITH_QTWEBKIT
|
| 24 |
|
#include <QWebFrame>
|
|
24 |
#include <qwebframe.h>
|
| 25 |
25 |
#else
|
| 26 |
26 |
|
| 27 |
27 |
#include <QObject>
|
| 28 |
|
-- qgis-3.2.0/src/core/qgswebview.h.orig 2018-06-22 09:32:42.880226243 +0100
|
|
28 |
++ qgis-3.2.0/src/core/qgswebview.h 2018-06-22 09:33:19.564227148 +0100
|
| ... | ... | |
| 22 |
22 |
#include <QWidget>
|
| 23 |
23 |
|
| 24 |
24 |
#ifdef WITH_QTWEBKIT
|
| 25 |
|
#include <QWebView>
|
|
25 |
#include <qwebview.h>
|
| 26 |
26 |
#include <QDesktopWidget>
|
| 27 |
27 |
|
| 28 |
28 |
#include "qgis_core.h"
|
| 29 |
|
-- qgis-3.2.0/src/gui/qgsexternalresourcewidget.cpp.orig 2018-06-22 09:34:47.640229321 +0100
|
|
29 |
++ qgis-3.2.0/src/gui/qgsexternalresourcewidget.cpp 2018-06-22 09:35:11.820229917 +0100
|
| ... | ... | |
| 24 |
24 |
#include <QSettings>
|
| 25 |
25 |
#include <QImageReader>
|
| 26 |
26 |
#ifdef WITH_QTWEBKIT
|
| 27 |
|
#include <QWebView>
|
|
27 |
#include <qwebview.h>
|
| 28 |
28 |
#endif
|
| 29 |
29 |
|
| 30 |
30 |
|
| 31 |
|
-- qgis-3.2.0/src/gui/qgsmaptip.cpp.orig 2018-06-22 09:37:27.820233272 +0100
|
|
31 |
++ qgis-3.2.0/src/gui/qgsmaptip.cpp 2018-06-22 09:37:55.436233954 +0100
|
| ... | ... | |
| 29 |
29 |
#include <QLabel>
|
| 30 |
30 |
#include <QDesktopServices>
|
| 31 |
31 |
#if WITH_QTWEBKIT
|
| 32 |
|
#include <QWebElement>
|
|
32 |
#include <qwebelement.h>
|
| 33 |
33 |
#endif
|
| 34 |
34 |
#include <QHBoxLayout>
|
| 35 |
35 |
|
| 36 |
|
-- qgis-3.2.0/src/3d/qgscameracontroller.h.orig 2018-06-22 10:14:49.604288577 +0100
|
|
36 |
++ qgis-3.2.0/src/3d/qgscameracontroller.h 2018-06-22 10:31:32.224313311 +0100
|
| ... | ... | |
| 19 |
19 |
#include "qgis_3d.h"
|
| 20 |
20 |
|
| 21 |
21 |
#include <Qt3DCore/QEntity>
|
| 22 |
|
#include <Qt3DInput>
|
| 23 |
|
#include <Qt3DRender>
|
|
22 |
#include <Qt3DInput/Qt3DInput>
|
|
23 |
#include <Qt3DRender/Qt3DRender>
|
| 24 |
24 |
|
| 25 |
25 |
class QDomDocument;
|
| 26 |
26 |
class QDomElement;
|
| 27 |
|
-- qgis-3.2.0/src/3d/terrain/qgsdemterraintileloader_p.cpp.orig 2018-06-22 16:47:07.248059066 +0100
|
|
27 |
++ qgis-3.2.0/src/3d/terrain/qgsdemterraintileloader_p.cpp 2018-06-22 16:48:38.440061315 +0100
|
| ... | ... | |
| 24 |
24 |
#include "qgsterraintileentity_p.h"
|
| 25 |
25 |
|
| 26 |
26 |
#include <Qt3DRender/QGeometryRenderer>
|
|
27 |
#include <Qt3DCore/QTransform>
|
| 27 |
28 |
|
| 28 |
29 |
///@cond PRIVATE
|
| 29 |
30 |
|
| 30 |
|
-- qgis-3.2.0/src/3d/terrain/qgsflatterraingenerator.cpp.orig 2018-06-22 19:23:27.576290476 +0100
|
|
31 |
++ qgis-3.2.0/src/3d/terrain/qgsflatterraingenerator.cpp 2018-06-22 19:24:24.784291887 +0100
|
| ... | ... | |
| 15 |
15 |
|
| 16 |
16 |
#include "qgsflatterraingenerator.h"
|
| 17 |
17 |
|
|
18 |
#include <Qt3DCore/QTransform>
|
| 18 |
19 |
#include <Qt3DRender/QGeometryRenderer>
|
| 19 |
20 |
#include <Qt3DExtras/QPlaneGeometry>
|
| 20 |
21 |
|
| 21 |
|
-- qgis-3.2.0/src/plugins/grass/qgsgrassmoduleinput.cpp.orig 2018-06-22 19:56:26.976339307 +0100
|
|
22 |
++ qgis-3.2.0/src/plugins/grass/qgsgrassmoduleinput.cpp 2018-06-22 19:58:41.072342615 +0100
|
| ... | ... | |
| 14 |
14 |
* *
|
| 15 |
15 |
***************************************************************************/
|
| 16 |
16 |
|
|
17 |
#include <QHeaderView>
|
| 17 |
18 |
#include <QCompleter>
|
| 18 |
19 |
#include <QFileDialog>
|
| 19 |
20 |
#include <QFileInfo>
|
| 20 |
|
-- qgis-3.2.0/src/plugins/grass/qgsgrassregion.cpp.orig 2018-06-22 20:01:54.316347383 +0100
|
|
21 |
++ qgis-3.2.0/src/plugins/grass/qgsgrassregion.cpp 2018-06-22 20:04:49.124351695 +0100
|
| ... | ... | |
| 25 |
25 |
#include "qgsmaptool.h"
|
| 26 |
26 |
#include "qgsexception.h"
|
| 27 |
27 |
|
|
28 |
#include <QDoubleValidator>
|
|
29 |
#include <QIntValidator>
|
| 28 |
30 |
#include <QButtonGroup>
|
| 29 |
31 |
#include <QColorDialog>
|
| 30 |
32 |
#include <QMessageBox>
|