diff options
Diffstat (limited to 'src/qml/common')
| -rw-r--r-- | src/qml/common/qv4compileddata_p.h | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h index f033a43aaa..82424c1c9d 100644 --- a/src/qml/common/qv4compileddata_p.h +++ b/src/qml/common/qv4compileddata_p.h @@ -30,7 +30,9 @@ #endif #include <private/qendian_p.h> +#include <private/qqmlrefcount_p.h> #include <private/qv4staticvalue_p.h> + #include <functional> #include <limits.h> @@ -1421,9 +1423,9 @@ using DependentTypesHasher = std::function<QByteArray()>; // This is how this hooks into the existing structures: -struct CompilationUnit +struct CompilationUnit final : public QQmlRefCounted<CompilationUnit> { - Q_DISABLE_COPY(CompilationUnit) + Q_DISABLE_COPY_MOVE(CompilationUnit) const Unit *data = nullptr; const QmlUnit *qmlData = nullptr; @@ -1465,32 +1467,6 @@ public: #endif } - CompilationUnit(CompilationUnit &&other) noexcept - { - *this = std::move(other); - } - - CompilationUnit &operator=(CompilationUnit &&other) noexcept - { - if (this != &other) { - data = other.data; - other.data = nullptr; - qmlData = other.qmlData; - other.qmlData = nullptr; - dynamicStrings = std::move(other.dynamicStrings); - other.dynamicStrings.clear(); - aotCompiledFunctions = other.aotCompiledFunctions; - other.aotCompiledFunctions = nullptr; - constants = other.constants; - other.constants = nullptr; - m_fileName = std::move(other.m_fileName); - other.m_fileName.clear(); - m_finalUrlString = std::move(other.m_finalUrlString); - other.m_finalUrlString.clear(); - } - return *this; - } - const Unit *unitData() const { return data; } void setUnitData(const Unit *unitData, const QmlUnit *qmlUnit = nullptr, |