WEBKIT includes changed

gshegunov · m-kuhn · commit 1c6a40cb6f94 · 2015-07-30T11:15:01.000+02:00
(cherry picked from commit 9f6c72f)
diff --git a/src/core/qgswebframe.h b/src/core/qgswebframe.h
@@ -17,7 +17,7 @@
 #define QGSWEBFRAME_H
 
 #ifdef WITH_QTWEBKIT
-#include <QtWebKit/QWebFrame>
+#include <QWebFrame>
 #else
 
 #include <QObject>
diff --git a/src/core/qgswebview.h b/src/core/qgswebview.h
@@ -20,7 +20,7 @@
 #include <QPrinter>
 
 #ifdef WITH_QTWEBKIT
-#include <QtWebKit/QWebView>
+#include <QWebView>
 
 class CORE_EXPORT QgsWebView : public QWebView
 {
diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp
@@ -35,7 +35,9 @@
 #include "qgsvaluerelationwidgetfactory.h"
 #include "qgsuuidwidgetfactory.h"
 #include "qgsphotowidgetfactory.h"
+#ifdef WITH_QTWEBKIT
 #include "qgswebviewwidgetfactory.h"
+#endif
 #include "qgscolorwidgetfactory.h"
 #include "qgsrelationreferencefactory.h"
 #include "qgsdatetimeeditfactory.h"

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`#include <QPrinter>`
`21`	`21`
`22`	`22`	`#ifdef WITH_QTWEBKIT`
`23`		`-#include <QtWebKit/QWebView>`
	`23`	`+#include <QWebView>`
`24`	`24`
`25`	`25`	`class CORE_EXPORT QgsWebView : public QWebView`
`26`	`26`	`{`