diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-08 17:20:19 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-08 17:20:34 +0100 |
commit | 776442f2117c4b2d6dac75ab56b42bd82e2ce6d0 (patch) | |
tree | 8b1730f28cb700e58bf254c440c4167991b94fe3 /src/webenginewidgets/api/qwebenginescript.h | |
parent | 82f4d13a13b40d9cb7710f6dd4190175a272a394 (diff) | |
parent | 489c9d0f631f79057bb16994b6719395d97f80ab (diff) |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I98705a1bb82917147f36a89761eedfc755a45bc5
Diffstat (limited to 'src/webenginewidgets/api/qwebenginescript.h')
-rw-r--r-- | src/webenginewidgets/api/qwebenginescript.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginescript.h b/src/webenginewidgets/api/qwebenginescript.h index 29126b110..a3cc66179 100644 --- a/src/webenginewidgets/api/qwebenginescript.h +++ b/src/webenginewidgets/api/qwebenginescript.h @@ -99,7 +99,9 @@ private: QSharedDataPointer<QtWebEngineCore::UserScript> d; }; +#if QT_VERSION >= QT_VERSION_CHECK(5,6,0) Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QWebEngineScript) +#endif #ifndef QT_NO_DEBUG_STREAM QWEBENGINEWIDGETS_EXPORT QDebug operator<<(QDebug, const QWebEngineScript &); |