summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/webview/qwebview_darwin.mm5
-rw-r--r--src/webview/qwebview_darwin_p.h4
-rw-r--r--src/webview/qwebview_osx.mm6
-rw-r--r--src/webview/qwebview_osx_p.h4
4 files changed, 9 insertions, 10 deletions
diff --git a/src/webview/qwebview_darwin.mm b/src/webview/qwebview_darwin.mm
index 24587aa..6d337c2 100644
--- a/src/webview/qwebview_darwin.mm
+++ b/src/webview/qwebview_darwin.mm
@@ -106,6 +106,7 @@ static inline CGRect toCGRect(const QRectF &rect)
return CGRectMake(rect.x(), rect.y(), rect.width(), rect.height());
}
+QT_END_NAMESPACE
// -------------------------------------------------------------------------
#ifdef Q_OS_IOS
@@ -154,8 +155,6 @@ static inline CGRect toCGRect(const QRectF &rect)
#if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_10, __IPHONE_8_0)
-class QWebViewInterface;
-
@interface QtWKWebViewDelegate : NSObject<WKNavigationDelegate> {
QDarwinWebViewPrivate *qDarwinWebViewPrivate;
}
@@ -242,6 +241,8 @@ class QWebViewInterface;
@end
+QT_BEGIN_NAMESPACE
+
QDarwinWebViewPrivate::QDarwinWebViewPrivate(QObject *p)
: QWebViewPrivate(p)
, wkWebView(nil)
diff --git a/src/webview/qwebview_darwin_p.h b/src/webview/qwebview_darwin_p.h
index 4bbe6ab..2b188e8 100644
--- a/src/webview/qwebview_darwin_p.h
+++ b/src/webview/qwebview_darwin_p.h
@@ -66,14 +66,14 @@
@end
#endif
-QT_BEGIN_NAMESPACE
-
Q_FORWARD_DECLARE_OBJC_CLASS(WKWebView);
#ifdef Q_OS_IOS
Q_FORWARD_DECLARE_OBJC_CLASS(UIGestureRecognizer);
#endif
+QT_BEGIN_NAMESPACE
+
class QDarwinWebViewPrivate : public QWebViewPrivate
{
Q_OBJECT
diff --git a/src/webview/qwebview_osx.mm b/src/webview/qwebview_osx.mm
index e64ad06..80d33e5 100644
--- a/src/webview/qwebview_osx.mm
+++ b/src/webview/qwebview_osx.mm
@@ -45,10 +45,6 @@
#import <CoreFoundation/CoreFoundation.h>
#import <WebKit/WebKit.h>
-QT_BEGIN_NAMESPACE
-
-class QOsxWebViewPrivate;
-
#if QT_MACOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__MAC_10_11)
#define QtFrameLoadDelegateProtocol <WebFrameLoadDelegate>
#else
@@ -132,6 +128,8 @@ class QOsxWebViewPrivate;
@end
+QT_BEGIN_NAMESPACE
+
QOsxWebViewPrivate::QOsxWebViewPrivate(QWebView *q)
: QWebViewPrivate(q)
{
diff --git a/src/webview/qwebview_osx_p.h b/src/webview/qwebview_osx_p.h
index 4f5344e..33d09a2 100644
--- a/src/webview/qwebview_osx_p.h
+++ b/src/webview/qwebview_osx_p.h
@@ -54,10 +54,10 @@
#include "qwebview_p_p.h"
-QT_BEGIN_NAMESPACE
-
Q_FORWARD_DECLARE_OBJC_CLASS(WebView);
+QT_BEGIN_NAMESPACE
+
class QOsxWebViewPrivate : public QWebViewPrivate
{
Q_OBJECT