diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-13 17:22:14 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-06-22 01:11:03 +0000 |
| commit | c3eab0ec30499919c18486633a446069d9690bd8 (patch) | |
| tree | 4ea560a3385243b4787a38c6eea90bae90050fd8 | |
| parent | 44b7e5650ab0627bb86274930c8f62f8f312a3d6 (diff) | |
Fix compiler warnings in the macOS WebView implementation.
Change-Id: I16eb8133bb355edf7ab8eb98fafbab0ecdb156e7
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| -rw-r--r-- | src/webview/qwebview_osx.mm | 2 | ||||
| -rw-r--r-- | src/webview/qwebview_osx_p.h | 24 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/webview/qwebview_osx.mm b/src/webview/qwebview_osx.mm index 60725e7..f50bb32 100644 --- a/src/webview/qwebview_osx.mm +++ b/src/webview/qwebview_osx.mm @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QOsxWebViewPrivate; -@interface QtFrameLoadDelegate : NSObject { +@interface QtFrameLoadDelegate : NSObject <WebFrameLoadDelegate> { QOsxWebViewPrivate *qtWebViewPrivate; } - (QtFrameLoadDelegate *)initWithQWebViewPrivate:(QOsxWebViewPrivate *)webViewPrivate; diff --git a/src/webview/qwebview_osx_p.h b/src/webview/qwebview_osx_p.h index bacd70b..4f5344e 100644 --- a/src/webview/qwebview_osx_p.h +++ b/src/webview/qwebview_osx_p.h @@ -65,14 +65,14 @@ public: QOsxWebViewPrivate(QWebView *q); ~QOsxWebViewPrivate(); - QUrl url() const; - void setUrl(const QUrl &url); - bool canGoBack() const; - bool canGoForward() const; - QString title() const; - int loadProgress() const; - bool isLoading() const; - void runJavaScriptPrivate(const QString& script, int callbackId); + QUrl url() const Q_DECL_OVERRIDE; + void setUrl(const QUrl &url) Q_DECL_OVERRIDE; + bool canGoBack() const Q_DECL_OVERRIDE; + bool canGoForward() const Q_DECL_OVERRIDE; + QString title() const Q_DECL_OVERRIDE; + int loadProgress() const Q_DECL_OVERRIDE; + bool isLoading() const Q_DECL_OVERRIDE; + void runJavaScriptPrivate(const QString& script, int callbackId) Q_DECL_OVERRIDE; void setParentView(QObject *view) Q_DECL_OVERRIDE; QObject *parentView() const Q_DECL_OVERRIDE; @@ -81,10 +81,10 @@ public: void setVisible(bool visible) Q_DECL_OVERRIDE; public Q_SLOTS: - void goBack(); - void goForward(); - void reload(); - void stop(); + void goBack() Q_DECL_OVERRIDE; + void goForward() Q_DECL_OVERRIDE; + void reload() Q_DECL_OVERRIDE; + void stop() Q_DECL_OVERRIDE; void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()) Q_DECL_OVERRIDE; public: |