fix windows build

jef-n · jef-n · commit 5910adf55e7b · 2015-05-22T08:39:07.000+02:00
diff --git a/src/core/qgswebframe.h b/src/core/qgswebframe.h
@@ -24,13 +24,13 @@
 #include <QPainter>
 #include <QUrl>
 
-class QWebFrame : public QObject
+class CORE_EXPORT QWebFrame : public QObject
 {
-  Q_OBJECT
+    Q_OBJECT
 
   public:
     QWebFrame( QObject* parent = 0 )
-      :QObject( parent )
+        : QObject( parent )
     {
 
     }
diff --git a/src/core/qgswebpage.h b/src/core/qgswebpage.h
@@ -28,47 +28,48 @@
 #include <QNetworkAccessManager>
 #include <QPalette>
 
-class QWebSettings : public QObject
+class CORE_EXPORT QWebSettings : public QObject
 {
     Q_OBJECT
 
   public:
 
-    enum WebAttribute {
-        AutoLoadImages,
-        JavascriptEnabled,
-        JavaEnabled,
-        PluginsEnabled,
-        PrivateBrowsingEnabled,
-        JavascriptCanOpenWindows,
-        JavascriptCanAccessClipboard,
-        DeveloperExtrasEnabled,
-        LinksIncludedInFocusChain,
-        ZoomTextOnly,
-        PrintElementBackgrounds,
-        OfflineStorageDatabaseEnabled,
-        OfflineWebApplicationCacheEnabled,
-        LocalStorageEnabled,
-        LocalContentCanAccessRemoteUrls,
-        DnsPrefetchEnabled,
-        XSSAuditingEnabled,
-        AcceleratedCompositingEnabled,
-        SpatialNavigationEnabled,
-        LocalContentCanAccessFileUrls,
-        TiledBackingStoreEnabled,
-        FrameFlatteningEnabled,
-        SiteSpecificQuirksEnabled,
-        JavascriptCanCloseWindows,
-        WebGLEnabled,
-        CSSRegionsEnabled,
-        HyperlinkAuditingEnabled,
-        CSSGridLayoutEnabled,
-        ScrollAnimatorEnabled,
-        CaretBrowsingEnabled,
-        NotificationsEnabled
+    enum WebAttribute
+    {
+      AutoLoadImages,
+      JavascriptEnabled,
+      JavaEnabled,
+      PluginsEnabled,
+      PrivateBrowsingEnabled,
+      JavascriptCanOpenWindows,
+      JavascriptCanAccessClipboard,
+      DeveloperExtrasEnabled,
+      LinksIncludedInFocusChain,
+      ZoomTextOnly,
+      PrintElementBackgrounds,
+      OfflineStorageDatabaseEnabled,
+      OfflineWebApplicationCacheEnabled,
+      LocalStorageEnabled,
+      LocalContentCanAccessRemoteUrls,
+      DnsPrefetchEnabled,
+      XSSAuditingEnabled,
+      AcceleratedCompositingEnabled,
+      SpatialNavigationEnabled,
+      LocalContentCanAccessFileUrls,
+      TiledBackingStoreEnabled,
+      FrameFlatteningEnabled,
+      SiteSpecificQuirksEnabled,
+      JavascriptCanCloseWindows,
+      WebGLEnabled,
+      CSSRegionsEnabled,
+      HyperlinkAuditingEnabled,
+      CSSGridLayoutEnabled,
+      ScrollAnimatorEnabled,
+      CaretBrowsingEnabled,
+      NotificationsEnabled
     };
     explicit QWebSettings( QObject* parent = 0 )
-      :QObject( parent )
+        : QObject( parent )
     {
 
     }
@@ -90,21 +91,23 @@ class QWebPage : public QObject
 
   public:
 
-    enum LinkDelegationPolicy {
-        DontDelegateLinks,
-        DelegateExternalLinks,
-        DelegateAllLinks
+    enum LinkDelegationPolicy
+    {
+      DontDelegateLinks,
+      DelegateExternalLinks,
+      DelegateAllLinks
     };
 
-    enum WebWindowType {
-        WebBrowserWindow,
-        WebModalDialog
+    enum WebWindowType
+    {
+      WebBrowserWindow,
+      WebModalDialog
     };
 
     explicit QWebPage( QObject* parent = 0 )
-      : QObject( parent )
-      , mSettings( new QWebSettings() )
-      , mFrame( new QWebFrame() )
+        : QObject( parent )
+        , mSettings( new QWebSettings() )
+        , mFrame( new QWebFrame() )
     {
     }
 
@@ -124,7 +127,7 @@ class QWebPage : public QObject
       Q_UNUSED( palette );
     }
 
-    void setViewportSize(const QSize & size) const
+    void setViewportSize( const QSize & size ) const
     {
       Q_UNUSED( size );
     }
diff --git a/src/core/qgswebview.h b/src/core/qgswebview.h
@@ -22,26 +22,26 @@
 #ifdef WITH_QTWEBKIT
 #include <QtWebKit/QWebView>
 
-class QgsWebView : public QWebView
+class CORE_EXPORT QgsWebView : public QWebView
 {
     Q_OBJECT
 
   public:
-    explicit QgsWebView(QWidget* parent = 0)
-      : QWebView( parent )
+    explicit QgsWebView( QWidget* parent = 0 )
+        : QWebView( parent )
     {}
 };
 #else
 #include "qgswebpage.h"
 
-class QgsWebView : public QWidget
+class CORE_EXPORT QgsWebView : public QWidget
 {
     Q_OBJECT
   public:
-    explicit QgsWebView(QWidget *parent = 0)
-      : QWidget(parent )
-      , mSettings( new QWebSettings() )
-      , mPage( new QWebPage() )
+    explicit QgsWebView( QWidget *parent = 0 )
+        : QWidget( parent )
+        , mSettings( new QWebSettings() )
+        , mPage( new QWebPage() )
     {
     }
 
@@ -77,7 +77,7 @@ class QgsWebView : public QWidget
       Q_UNUSED( html );
     }
 
-    virtual QgsWebView* createWindow(QWebPage::WebWindowType)
+    virtual QgsWebView* createWindow( QWebPage::WebWindowType )
     {
       return new QgsWebView();
     }

Original file line number	Diff line number	Diff line change
`@@ -24,13 +24,13 @@`
`24`	`24`	`#include <QPainter>`
`25`	`25`	`#include <QUrl>`
`26`	`26`
`27`		`-class QWebFrame : public QObject`
	`27`	`+class CORE_EXPORT QWebFrame : public QObject`
`28`	`28`	`{`
`29`		`- Q_OBJECT`
	`29`	`+ Q_OBJECT`
`30`	`30`
`31`	`31`	`public:`
`32`	`32`	`QWebFrame( QObject* parent = 0 )`
`33`		`- :QObject( parent )`
	`33`	`+ : QObject( parent )`
`34`	`34`	`{`
`35`	`35`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,26 +22,26 @@`
`22`	`22`	`#ifdef WITH_QTWEBKIT`
`23`	`23`	`#include <QtWebKit/QWebView>`
`24`	`24`
`25`		`-class QgsWebView : public QWebView`
	`25`	`+class CORE_EXPORT QgsWebView : public QWebView`
`26`	`26`	`{`
`27`	`27`	`Q_OBJECT`
`28`	`28`
`29`	`29`	`public:`
`30`		`- explicit QgsWebView(QWidget* parent = 0)`
`31`		`- : QWebView( parent )`
	`30`	`+ explicit QgsWebView( QWidget* parent = 0 )`
	`31`	`+ : QWebView( parent )`
`32`	`32`	`{}`
`33`	`33`	`};`
`34`	`34`	`#else`
`35`	`35`	`#include "qgswebpage.h"`
`36`	`36`
`37`		`-class QgsWebView : public QWidget`
	`37`	`+class CORE_EXPORT QgsWebView : public QWidget`
`38`	`38`	`{`
`39`	`39`	`Q_OBJECT`
`40`	`40`	`public:`
`41`		`- explicit QgsWebView(QWidget *parent = 0)`
`42`		`- : QWidget(parent )`
`43`		`- , mSettings( new QWebSettings() )`
`44`		`- , mPage( new QWebPage() )`
	`41`	`+ explicit QgsWebView( QWidget *parent = 0 )`
	`42`	`+ : QWidget( parent )`
	`43`	`+ , mSettings( new QWebSettings() )`
	`44`	`+ , mPage( new QWebPage() )`
`45`	`45`	`{`
`46`	`46`	`}`
`47`	`47`
`@@ -77,7 +77,7 @@ class QgsWebView : public QWidget`
`77`	`77`	`Q_UNUSED( html );`
`78`	`78`	`}`
`79`	`79`
`80`		`- virtual QgsWebView* createWindow(QWebPage::WebWindowType)`
	`80`	`+ virtual QgsWebView* createWindow( QWebPage::WebWindowType )`
`81`	`81`	`{`
`82`	`82`	`return new QgsWebView();`
`83`	`83`	`}`