summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Buhr <andreas@andreasbuhr.de>2021-07-28 12:01:30 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-08-12 22:54:53 +0000
commit43fa1753e7e2f0970c3082b103413ec94572ab1e (patch)
treee42ddf195272433685624a25bf71e48940baa70c
parent42a176f3fe593d64ecfde962c3afe123804a6af3 (diff)
Replace discouraged Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPEv6.2.0-beta3
Q_MOVABLE_TYPE was conceived before C++ had move semantics. Now, with move semantics, its name is misleading. Q_RELOCATABLE_TYPE was introduced as a synonym to Q_MOVABLE_TYPE. Usage of Q_MOVABLE_TYPE is discouraged now. This patch replaces all usages of Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE in qtwebengine. As the two are synonymous, this patch should have no impact on users. Task-number: QTBUG-86829 Change-Id: I6cf26bb24c4d68cc3da85193cf6f8e63daeaa9d7 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit b5a5042f582bd3849d89a1284650df0f5c5834c9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/core/api/qwebenginecookiestore_p.h2
-rw-r--r--src/core/api/qwebenginescript.h2
-rw-r--r--src/pdfwidgets/qpdfview_p.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/api/qwebenginecookiestore_p.h b/src/core/api/qwebenginecookiestore_p.h
index fefcc5b3..1a238ea8 100644
--- a/src/core/api/qwebenginecookiestore_p.h
+++ b/src/core/api/qwebenginecookiestore_p.h
@@ -99,7 +99,7 @@ public:
void onCookieChanged(const QNetworkCookie &cookie, bool removed);
};
-Q_DECLARE_TYPEINFO(QWebEngineCookieStorePrivate::CookieData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QWebEngineCookieStorePrivate::CookieData, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE
diff --git a/src/core/api/qwebenginescript.h b/src/core/api/qwebenginescript.h
index 03964932..b3768c10 100644
--- a/src/core/api/qwebenginescript.h
+++ b/src/core/api/qwebenginescript.h
@@ -115,7 +115,7 @@ private:
QSharedDataPointer<QtWebEngineCore::UserScript> d;
};
-Q_DECLARE_TYPEINFO(QWebEngineScript, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QWebEngineScript, Q_RELOCATABLE_TYPE);
#ifndef QT_NO_DEBUG_STREAM
Q_WEBENGINECORE_EXPORT QDebug operator<<(QDebug, const QWebEngineScript &);
diff --git a/src/pdfwidgets/qpdfview_p.h b/src/pdfwidgets/qpdfview_p.h
index d6b3f034..60f67ec4 100644
--- a/src/pdfwidgets/qpdfview_p.h
+++ b/src/pdfwidgets/qpdfview_p.h
@@ -113,7 +113,7 @@ public:
qreal m_screenResolution; // pixels per point
};
-Q_DECLARE_TYPEINFO(QPdfViewPrivate::DocumentLayout, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QPdfViewPrivate::DocumentLayout, Q_RELOCATABLE_TYPE);
QT_END_NAMESPACE