summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2025-09-15 09:50:27 +0200
committerMarc Mutz <marc.mutz@qt.io>2025-09-15 11:18:33 +0200
commit47ba718f722761aa211ae2bbc975ab7b9dc6f89b (patch)
tree51317ae0e9df5403806036f5d2822800b90bcbb1
parent3d43383a11cd03727be07768b0b18daea039006a (diff)
QWebEngineFrame: keep using RO0
Amends 3ee3548e4c663402848db3b1336bf56e7c6d327e, which incorrectly and needlessly made the move SMFs out-of-line (move SMFs must always be inline in Qt). All these functions were already inline in 6.9, so keep it that way, just with explicit = default, which is how the 6.9 cherry-pick of said commit was also resolved. Found in API-Review. Pick-to: 6.10 6.10.0 Change-Id: I85595614fcb33c0ae545c751006d0b70a14d8629 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/api/qwebengineframe.cpp7
-rw-r--r--src/core/api/qwebengineframe.h12
2 files changed, 6 insertions, 13 deletions
diff --git a/src/core/api/qwebengineframe.cpp b/src/core/api/qwebengineframe.cpp
index 4e8a5c931..9b85d08d4 100644
--- a/src/core/api/qwebengineframe.cpp
+++ b/src/core/api/qwebengineframe.cpp
@@ -46,13 +46,6 @@ QWebEngineFrame::QWebEngineFrame(QWeakPointer<QtWebEngineCore::WebContentsAdapte
{
}
-QWebEngineFrame::QWebEngineFrame() = default;
-QWebEngineFrame::~QWebEngineFrame() = default;
-QWebEngineFrame::QWebEngineFrame(QWebEngineFrame &&other) = default;
-QWebEngineFrame::QWebEngineFrame(const QWebEngineFrame &other) = default;
-QWebEngineFrame &QWebEngineFrame::operator=(QWebEngineFrame &&other) = default;
-QWebEngineFrame &QWebEngineFrame::operator=(const QWebEngineFrame &other) = default;
-
/*!
Returns \c{true} if this object represents an existing frame; \c{false} otherwise.
diff --git a/src/core/api/qwebengineframe.h b/src/core/api/qwebengineframe.h
index 6b37d35ee..44554987d 100644
--- a/src/core/api/qwebengineframe.h
+++ b/src/core/api/qwebengineframe.h
@@ -32,12 +32,12 @@ class QWebEngineFrame
Q_PROPERTY(bool isMainFrame READ isMainFrame FINAL)
public:
- Q_WEBENGINECORE_EXPORT QWebEngineFrame();
- Q_WEBENGINECORE_EXPORT QWebEngineFrame(const QWebEngineFrame &other);
- Q_WEBENGINECORE_EXPORT QWebEngineFrame &operator=(const QWebEngineFrame &other);
- Q_WEBENGINECORE_EXPORT QWebEngineFrame(QWebEngineFrame &&other);
- Q_WEBENGINECORE_EXPORT QWebEngineFrame &operator=(QWebEngineFrame &&other);
- Q_WEBENGINECORE_EXPORT ~QWebEngineFrame();
+ QWebEngineFrame() = default;
+ QWebEngineFrame(const QWebEngineFrame &other) = default;
+ QWebEngineFrame &operator=(const QWebEngineFrame &other) = default;
+ QWebEngineFrame(QWebEngineFrame &&other) = default;
+ QWebEngineFrame &operator=(QWebEngineFrame &&other) = default;
+ ~QWebEngineFrame() = default;
Q_WEBENGINECORE_EXPORT bool isValid() const;
Q_WEBENGINECORE_EXPORT QString name() const;