Merge remote-tracking branch 'origin/5.11' into dev

Change-Id: I308b964d86ca01916f6af7d6e3f71557e3624eca

36 files changed, 169 insertions, 169 deletions

diff --git a/src/qml/animations/qanimationgroupjob_p.h b/src/qml/animations/qanimationgroupjob_p.h
index 44250079c7..b01b2f3b36 100644
--- a/src/qml/animations/qanimationgroupjob_p.h
+++ b/src/qml/animations/qanimationgroupjob_p.h
@@ -63,7 +63,7 @@ class Q_QML_PRIVATE_EXPORT QAnimationGroupJob : public QAbstractAnimationJob
     Q_DISABLE_COPY(QAnimationGroupJob)
 public:
     QAnimationGroupJob();
-    ~QAnimationGroupJob();
+    ~QAnimationGroupJob() override;
 
     void appendAnimation(QAbstractAnimationJob *animation);
     void prependAnimation(QAbstractAnimationJob *animation);
diff --git a/src/qml/animations/qpauseanimationjob_p.h b/src/qml/animations/qpauseanimationjob_p.h
index 53bf8a88b5..6c9bbf0dab 100644
--- a/src/qml/animations/qpauseanimationjob_p.h
+++ b/src/qml/animations/qpauseanimationjob_p.h
@@ -62,7 +62,7 @@ class Q_QML_PRIVATE_EXPORT QPauseAnimationJob : public QAbstractAnimationJob
     Q_DISABLE_COPY(QPauseAnimationJob)
 public:
     explicit QPauseAnimationJob(int duration = 250);
-    ~QPauseAnimationJob();
+    ~QPauseAnimationJob() override;
 
     int duration() const override;
     void setDuration(int msecs);
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index eb5772e1bc..bc4ca5d6f4 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -2928,43 +2928,43 @@ public:
         return locs;
     }
 
-    bool visit(ArrayMemberExpression *) Q_DECL_OVERRIDE
+    bool visit(ArrayMemberExpression *) override
     {
         locs.setAllVolatile();
         return false;
     }
 
-    bool visit(FieldMemberExpression *) Q_DECL_OVERRIDE
+    bool visit(FieldMemberExpression *) override
     {
         locs.setAllVolatile();
         return false;
     }
 
-    bool visit(PostIncrementExpression *e) Q_DECL_OVERRIDE
+    bool visit(PostIncrementExpression *e) override
     {
         collectIdentifiers(locs.specificLocations, e->base);
         return false;
     }
 
-    bool visit(PostDecrementExpression *e) Q_DECL_OVERRIDE
+    bool visit(PostDecrementExpression *e) override
     {
         collectIdentifiers(locs.specificLocations, e->base);
         return false;
     }
 
-    bool visit(PreIncrementExpression *e) Q_DECL_OVERRIDE
+    bool visit(PreIncrementExpression *e) override
     {
         collectIdentifiers(locs.specificLocations, e->expression);
         return false;
     }
 
-    bool visit(PreDecrementExpression *e) Q_DECL_OVERRIDE
+    bool visit(PreDecrementExpression *e) override
     {
         collectIdentifiers(locs.specificLocations, e->expression);
         return false;
     }
 
-    bool visit(BinaryExpression *e) Q_DECL_OVERRIDE
+    bool visit(BinaryExpression *e) override
     {
         switch (e->op) {
         case QSOperator::InplaceAnd:
diff --git a/src/qml/debugger/qqmlabstractprofileradapter_p.h b/src/qml/debugger/qqmlabstractprofileradapter_p.h
index 4a01c271ca..f39f8fccd2 100644
--- a/src/qml/debugger/qqmlabstractprofileradapter_p.h
+++ b/src/qml/debugger/qqmlabstractprofileradapter_p.h
@@ -70,7 +70,7 @@ public:
 
     QQmlAbstractProfilerAdapter(QObject *parent = nullptr) :
         QObject(parent), service(nullptr), waiting(true), featuresEnabled(0) {}
-    virtual ~QQmlAbstractProfilerAdapter() {}
+    ~QQmlAbstractProfilerAdapter() override {}
     void setService(QQmlProfilerService *new_service) { service = new_service; }
 
     virtual qint64 sendMessages(qint64 until, QList<QByteArray> &messages) = 0;
diff --git a/src/qml/debugger/qqmldebugconnector_p.h b/src/qml/debugger/qqmldebugconnector_p.h
index cead6af338..d1ad90adfd 100644
--- a/src/qml/debugger/qqmldebugconnector_p.h
+++ b/src/qml/debugger/qqmldebugconnector_p.h
@@ -126,7 +126,7 @@ class Q_QML_PRIVATE_EXPORT QQmlDebugConnectorFactory : public QObject {
     Q_OBJECT
 public:
     virtual QQmlDebugConnector *create(const QString &key) = 0;
-    ~QQmlDebugConnectorFactory();
+    ~QQmlDebugConnectorFactory() override;
 };
 
 #define QQmlDebugConnectorFactory_iid "org.qt-project.Qt.QQmlDebugConnectorFactory"
diff --git a/src/qml/debugger/qqmldebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h
index e9f7d2d396..c52ba90a79 100644
--- a/src/qml/debugger/qqmldebugservice_p.h
+++ b/src/qml/debugger/qqmldebugservice_p.h
@@ -69,7 +69,7 @@ class Q_QML_PRIVATE_EXPORT QQmlDebugService : public QObject
     Q_DECLARE_PRIVATE(QQmlDebugService)
 
 public:
-    ~QQmlDebugService();
+    ~QQmlDebugService() override;
 
     const QString &name() const;
     float version() const;
diff --git a/src/qml/jit/qv4jit_p.h b/src/qml/jit/qv4jit_p.h
index 077c2e2177..c17ab4ff6e 100644
--- a/src/qml/jit/qv4jit_p.h
+++ b/src/qml/jit/qv4jit_p.h
@@ -119,131 +119,131 @@ public:
 
     void generate();
 
-    void generate_Ret() Q_DECL_OVERRIDE;
-    void generate_Debug() Q_DECL_OVERRIDE;
-    void generate_LoadConst(int index) Q_DECL_OVERRIDE;
-    void generate_LoadZero() Q_DECL_OVERRIDE;
-    void generate_LoadTrue() Q_DECL_OVERRIDE;
-    void generate_LoadFalse() Q_DECL_OVERRIDE;
-    void generate_LoadNull() Q_DECL_OVERRIDE;
-    void generate_LoadUndefined() Q_DECL_OVERRIDE;
-    void generate_LoadInt(int value) Q_DECL_OVERRIDE;
-    void generate_MoveConst(int constIndex, int destTemp) Q_DECL_OVERRIDE;
-    void generate_LoadReg(int reg) Q_DECL_OVERRIDE;
-    void generate_StoreReg(int reg) Q_DECL_OVERRIDE;
-    void generate_MoveReg(int srcReg, int destReg) Q_DECL_OVERRIDE;
-    void generate_LoadLocal(int index) Q_DECL_OVERRIDE;
-    void generate_StoreLocal(int index) Q_DECL_OVERRIDE;
-    void generate_LoadScopedLocal(int scope, int index) Q_DECL_OVERRIDE;
-    void generate_StoreScopedLocal(int scope, int index) Q_DECL_OVERRIDE;
-    void generate_LoadRuntimeString(int stringId) Q_DECL_OVERRIDE;
-    void generate_MoveRegExp(int regExpId, int destReg) Q_DECL_OVERRIDE;
-    void generate_LoadClosure(int value) Q_DECL_OVERRIDE;
-    void generate_LoadName(int name) Q_DECL_OVERRIDE;
-    void generate_LoadGlobalLookup(int index) Q_DECL_OVERRIDE;
-    void generate_StoreNameSloppy(int name) Q_DECL_OVERRIDE;
-    void generate_StoreNameStrict(int name) Q_DECL_OVERRIDE;
-    void generate_LoadElement(int base, int index) Q_DECL_OVERRIDE;
-    void generate_LoadElementA(int base) Q_DECL_OVERRIDE;
-    void generate_StoreElement(int base, int index) Q_DECL_OVERRIDE;
-    void generate_LoadProperty(int name, int base) Q_DECL_OVERRIDE;
-    void generate_LoadPropertyA(int name) Q_DECL_OVERRIDE;
-    void generate_GetLookup(int index, int base) Q_DECL_OVERRIDE;
-    void generate_GetLookupA(int index) Q_DECL_OVERRIDE;
-    void generate_StoreProperty(int name, int base) Q_DECL_OVERRIDE;
-    void generate_SetLookup(int index, int base) Q_DECL_OVERRIDE;
+    void generate_Ret() override;
+    void generate_Debug() override;
+    void generate_LoadConst(int index) override;
+    void generate_LoadZero() override;
+    void generate_LoadTrue() override;
+    void generate_LoadFalse() override;
+    void generate_LoadNull() override;
+    void generate_LoadUndefined() override;
+    void generate_LoadInt(int value) override;
+    void generate_MoveConst(int constIndex, int destTemp) override;
+    void generate_LoadReg(int reg) override;
+    void generate_StoreReg(int reg) override;
+    void generate_MoveReg(int srcReg, int destReg) override;
+    void generate_LoadLocal(int index) override;
+    void generate_StoreLocal(int index) override;
+    void generate_LoadScopedLocal(int scope, int index) override;
+    void generate_StoreScopedLocal(int scope, int index) override;
+    void generate_LoadRuntimeString(int stringId) override;
+    void generate_MoveRegExp(int regExpId, int destReg) override;
+    void generate_LoadClosure(int value) override;
+    void generate_LoadName(int name) override;
+    void generate_LoadGlobalLookup(int index) override;
+    void generate_StoreNameSloppy(int name) override;
+    void generate_StoreNameStrict(int name) override;
+    void generate_LoadElement(int base, int index) override;
+    void generate_LoadElementA(int base) override;
+    void generate_StoreElement(int base, int index) override;
+    void generate_LoadProperty(int name, int base) override;
+    void generate_LoadPropertyA(int name) override;
+    void generate_GetLookup(int index, int base) override;
+    void generate_GetLookupA(int index) override;
+    void generate_StoreProperty(int name, int base) override;
+    void generate_SetLookup(int index, int base) override;
     void generate_StoreScopeObjectProperty(int base,
-                                           int propertyIndex) Q_DECL_OVERRIDE;
+                                           int propertyIndex) override;
     void generate_StoreContextObjectProperty(int base,
-                                             int propertyIndex) Q_DECL_OVERRIDE;
+                                             int propertyIndex) override;
     void generate_LoadScopeObjectProperty(int propertyIndex, int base,
-                                          int captureRequired) Q_DECL_OVERRIDE;
+                                          int captureRequired) override;
     void generate_LoadContextObjectProperty(int propertyIndex, int base,
-                                            int captureRequired) Q_DECL_OVERRIDE;
-    void generate_LoadIdObject(int index, int base) Q_DECL_OVERRIDE;
-    void generate_CallValue(int name, int argc, int argv) Q_DECL_OVERRIDE;
-    void generate_CallProperty(int name, int base, int argc, int argv) Q_DECL_OVERRIDE;
-    void generate_CallPropertyLookup(int lookupIndex, int base, int argc, int argv) Q_DECL_OVERRIDE;
-    void generate_CallElement(int base, int index, int argc, int argv) Q_DECL_OVERRIDE;
-    void generate_CallName(int name, int argc, int argv) Q_DECL_OVERRIDE;
-    void generate_CallPossiblyDirectEval(int argc, int argv) Q_DECL_OVERRIDE;
-    void generate_CallGlobalLookup(int index, int argc, int argv) Q_DECL_OVERRIDE;
-    void generate_CallScopeObjectProperty(int propIdx, int base, int argc, int argv) Q_DECL_OVERRIDE;
-    void generate_CallContextObjectProperty(int propIdx, int base, int argc, int argv) Q_DECL_OVERRIDE;
-    void generate_SetExceptionHandler(int offset) Q_DECL_OVERRIDE;
-    void generate_ThrowException() Q_DECL_OVERRIDE;
-    void generate_GetException() Q_DECL_OVERRIDE;
-    void generate_SetException() Q_DECL_OVERRIDE;
-    void generate_CreateCallContext() Q_DECL_OVERRIDE;
-    void generate_PushCatchContext(int name, int reg) Q_DECL_OVERRIDE;
-    void generate_PushWithContext(int reg) Q_DECL_OVERRIDE;
-    void generate_PopContext(int reg) Q_DECL_OVERRIDE;
-    void generate_ForeachIteratorObject() Q_DECL_OVERRIDE;
-    void generate_ForeachNextPropertyName() Q_DECL_OVERRIDE;
-    void generate_DeleteMember(int member, int base) Q_DECL_OVERRIDE;
-    void generate_DeleteSubscript(int base, int index) Q_DECL_OVERRIDE;
-    void generate_DeleteName(int name) Q_DECL_OVERRIDE;
-    void generate_TypeofName(int name) Q_DECL_OVERRIDE;
-    void generate_TypeofValue() Q_DECL_OVERRIDE;
-    void generate_DeclareVar(int varName, int isDeletable) Q_DECL_OVERRIDE;
-    void generate_DefineArray(int argc, int args) Q_DECL_OVERRIDE;
+                                            int captureRequired) override;
+    void generate_LoadIdObject(int index, int base) override;
+    void generate_CallValue(int name, int argc, int argv) override;
+    void generate_CallProperty(int name, int base, int argc, int argv) override;
+    void generate_CallPropertyLookup(int lookupIndex, int base, int argc, int argv) override;
+    void generate_CallElement(int base, int index, int argc, int argv) override;
+    void generate_CallName(int name, int argc, int argv) override;
+    void generate_CallPossiblyDirectEval(int argc, int argv) override;
+    void generate_CallGlobalLookup(int index, int argc, int argv) override;
+    void generate_CallScopeObjectProperty(int propIdx, int base, int argc, int argv) override;
+    void generate_CallContextObjectProperty(int propIdx, int base, int argc, int argv) override;
+    void generate_SetExceptionHandler(int offset) override;
+    void generate_ThrowException() override;
+    void generate_GetException() override;
+    void generate_SetException() override;
+    void generate_CreateCallContext() override;
+    void generate_PushCatchContext(int name, int reg) override;
+    void generate_PushWithContext(int reg) override;
+    void generate_PopContext(int reg) override;
+    void generate_ForeachIteratorObject() override;
+    void generate_ForeachNextPropertyName() override;
+    void generate_DeleteMember(int member, int base) override;
+    void generate_DeleteSubscript(int base, int index) override;
+    void generate_DeleteName(int name) override;
+    void generate_TypeofName(int name) override;
+    void generate_TypeofValue() override;
+    void generate_DeclareVar(int varName, int isDeletable) override;
+    void generate_DefineArray(int argc, int args) override;
     void generate_DefineObjectLiteral(int internalClassId, int arrayValueCount,
                                       int arrayGetterSetterCountAndFlags,
-                                      int args) Q_DECL_OVERRIDE;
-    void generate_CreateMappedArgumentsObject() Q_DECL_OVERRIDE;
-    void generate_CreateUnmappedArgumentsObject() Q_DECL_OVERRIDE;
-    void generate_ConvertThisToObject() Q_DECL_OVERRIDE;
-    void generate_Construct(int func, int argc, int argv) Q_DECL_OVERRIDE;
-    void generate_Jump(int offset) Q_DECL_OVERRIDE;
-    void generate_JumpTrue(int offset) Q_DECL_OVERRIDE;
-    void generate_JumpFalse(int offset) Q_DECL_OVERRIDE;
-    void generate_CmpEqNull() Q_DECL_OVERRIDE;
-    void generate_CmpNeNull() Q_DECL_OVERRIDE;
-    void generate_CmpEqInt(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpNeInt(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpEq(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpNe(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpGt(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpGe(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpLt(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpLe(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpStrictEqual(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpStrictNotEqual(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpIn(int lhs) Q_DECL_OVERRIDE;
-    void generate_CmpInstanceOf(int lhs) Q_DECL_OVERRIDE;
+                                      int args) override;
+    void generate_CreateMappedArgumentsObject() override;
+    void generate_CreateUnmappedArgumentsObject() override;
+    void generate_ConvertThisToObject() override;
+    void generate_Construct(int func, int argc, int argv) override;
+    void generate_Jump(int offset) override;
+    void generate_JumpTrue(int offset) override;
+    void generate_JumpFalse(int offset) override;
+    void generate_CmpEqNull() override;
+    void generate_CmpNeNull() override;
+    void generate_CmpEqInt(int lhs) override;
+    void generate_CmpNeInt(int lhs) override;
+    void generate_CmpEq(int lhs) override;
+    void generate_CmpNe(int lhs) override;
+    void generate_CmpGt(int lhs) override;
+    void generate_CmpGe(int lhs) override;
+    void generate_CmpLt(int lhs) override;
+    void generate_CmpLe(int lhs) override;
+    void generate_CmpStrictEqual(int lhs) override;
+    void generate_CmpStrictNotEqual(int lhs) override;
+    void generate_CmpIn(int lhs) override;
+    void generate_CmpInstanceOf(int lhs) override;
     void generate_JumpStrictEqualStackSlotInt(int lhs, int rhs,
-                                              int offset) Q_DECL_OVERRIDE;
+                                              int offset) override;
     void generate_JumpStrictNotEqualStackSlotInt(int lhs, int rhs,
-                                                 int offset) Q_DECL_OVERRIDE;
-    void generate_UNot() Q_DECL_OVERRIDE;
-    void generate_UPlus() Q_DECL_OVERRIDE;
-    void generate_UMinus() Q_DECL_OVERRIDE;
-    void generate_UCompl() Q_DECL_OVERRIDE;
-    void generate_Increment() Q_DECL_OVERRIDE;
-    void generate_Decrement() Q_DECL_OVERRIDE;
-    void generate_Add(int lhs) Q_DECL_OVERRIDE;
-    void generate_BitAnd(int lhs) Q_DECL_OVERRIDE;
-    void generate_BitOr(int lhs) Q_DECL_OVERRIDE;
-    void generate_BitXor(int lhs) Q_DECL_OVERRIDE;
-    void generate_UShr(int lhs) Q_DECL_OVERRIDE;
-    void generate_Shr(int lhs) Q_DECL_OVERRIDE;
-    void generate_Shl(int lhs) Q_DECL_OVERRIDE;
-    void generate_BitAndConst(int rhs) Q_DECL_OVERRIDE;
-    void generate_BitOrConst(int rhs) Q_DECL_OVERRIDE;
-    void generate_BitXorConst(int rhs) Q_DECL_OVERRIDE;
-    void generate_UShrConst(int rhs) Q_DECL_OVERRIDE;
-    void generate_ShrConst(int rhs) Q_DECL_OVERRIDE;
-    void generate_ShlConst(int rhs) Q_DECL_OVERRIDE;
-    void generate_Mul(int lhs) Q_DECL_OVERRIDE;
-    void generate_Div(int lhs) Q_DECL_OVERRIDE;
-    void generate_Mod(int lhs) Q_DECL_OVERRIDE;
-    void generate_Sub(int lhs) Q_DECL_OVERRIDE;
-    void generate_LoadQmlContext(int result) Q_DECL_OVERRIDE;
-    void generate_LoadQmlImportedScripts(int result) Q_DECL_OVERRIDE;
-    void generate_LoadQmlSingleton(int name) Q_DECL_OVERRIDE;
+                                                 int offset) override;
+    void generate_UNot() override;
+    void generate_UPlus() override;
+    void generate_UMinus() override;
+    void generate_UCompl() override;
+    void generate_Increment() override;
+    void generate_Decrement() override;
+    void generate_Add(int lhs) override;
+    void generate_BitAnd(int lhs) override;
+    void generate_BitOr(int lhs) override;
+    void generate_BitXor(int lhs) override;
+    void generate_UShr(int lhs) override;
+    void generate_Shr(int lhs) override;
+    void generate_Shl(int lhs) override;
+    void generate_BitAndConst(int rhs) override;
+    void generate_BitOrConst(int rhs) override;
+    void generate_BitXorConst(int rhs) override;
+    void generate_UShrConst(int rhs) override;
+    void generate_ShrConst(int rhs) override;
+    void generate_ShlConst(int rhs) override;
+    void generate_Mul(int lhs) override;
+    void generate_Div(int lhs) override;
+    void generate_Mod(int lhs) override;
+    void generate_Sub(int lhs) override;
+    void generate_LoadQmlContext(int result) override;
+    void generate_LoadQmlImportedScripts(int result) override;
+    void generate_LoadQmlSingleton(int name) override;
 
-    void startInstruction(Moth::Instr::Type instr) Q_DECL_OVERRIDE;
-    void endInstruction(Moth::Instr::Type instr) Q_DECL_OVERRIDE;
+    void startInstruction(Moth::Instr::Type instr) override;
+    void endInstruction(Moth::Instr::Type instr) override;
 
 protected:
     bool hasLabel() const
diff --git a/src/qml/jsapi/qjsengine.h b/src/qml/jsapi/qjsengine.h
index 89642b6f20..3ba2b52e89 100644
--- a/src/qml/jsapi/qjsengine.h
+++ b/src/qml/jsapi/qjsengine.h
@@ -63,7 +63,7 @@ class Q_QML_EXPORT QJSEngine
 public:
     QJSEngine();
     explicit QJSEngine(QObject *parent);
-    virtual ~QJSEngine();
+    ~QJSEngine() override;
 
     QJSValue globalObject() const;
 
diff --git a/src/qml/jsapi/qjsengine_p.h b/src/qml/jsapi/qjsengine_p.h
index 1ea1d77851..360c9df075 100644
--- a/src/qml/jsapi/qjsengine_p.h
+++ b/src/qml/jsapi/qjsengine_p.h
@@ -75,7 +75,7 @@ public:
     static QJSEnginePrivate* get(QV4::ExecutionEngine *e);
 
     QJSEnginePrivate() : mutex(QMutex::Recursive) {}
-    ~QJSEnginePrivate();
+    ~QJSEnginePrivate() override;
 
     static void addToDebugServer(QJSEngine *q);
     static void removeFromDebugServer(QJSEngine *q);
diff --git a/src/qml/jsruntime/qv4debugging_p.h b/src/qml/jsruntime/qv4debugging_p.h
index 61a55964ab..9b41bb6e7a 100644
--- a/src/qml/jsruntime/qv4debugging_p.h
+++ b/src/qml/jsruntime/qv4debugging_p.h
@@ -78,7 +78,7 @@ class Q_QML_EXPORT Debugger : public QObject
     Q_OBJECT
 
 public:
-    virtual ~Debugger() {}
+    ~Debugger() override {}
     virtual bool pauseAtNextOpportunity() const = 0;
     virtual void maybeBreakAtInstruction() = 0;
     virtual void enteringFunction() = 0;
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
index 9aac5c4f70..b697a2081b 100644
--- a/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@ -920,7 +920,7 @@ void ExecutionEngine::requireArgumentsAccessors(int n)
         nArgumentsAccessors = qMax(8, n);
         argumentsAccessors = new Property[nArgumentsAccessors];
         if (oldAccessors) {
-            memcpy(argumentsAccessors, oldAccessors, oldSize*sizeof(Property));
+            memcpy(static_cast<void *>(argumentsAccessors), static_cast<const void *>(oldAccessors), oldSize*sizeof(Property));
             delete [] oldAccessors;
         }
         ExecutionContext *global = rootContext();
diff --git a/src/qml/jsruntime/qv4string.cpp b/src/qml/jsruntime/qv4string.cpp
index 8f6f50338e..447992ebec 100644
--- a/src/qml/jsruntime/qv4string.cpp
+++ b/src/qml/jsruntime/qv4string.cpp
@@ -221,7 +221,7 @@ void Heap::String::append(const String *data, QChar *ch)
             memcpy(ch, cs->left->toQString().constData() + cs->from, cs->len*sizeof(QChar));
             ch += cs->len;
         } else {
-            memcpy(ch, item->text->data(), item->text->size * sizeof(QChar));
+            memcpy(static_cast<void *>(ch), static_cast<const void *>(item->text->data()), item->text->size * sizeof(QChar));
             ch += item->text->size;
         }
     }
diff --git a/src/qml/parser/qqmljsparser.cpp b/src/qml/parser/qqmljsparser.cpp
index f1beec6387..24b04b02f9 100644
--- a/src/qml/parser/qqmljsparser.cpp
+++ b/src/qml/parser/qqmljsparser.cpp
@@ -79,7 +79,7 @@ void Parser::reallocateStack()
     sym_stack = reinterpret_cast<Value*> (realloc(sym_stack, stack_size * sizeof(Value)));
     state_stack = reinterpret_cast<int*> (realloc(state_stack, stack_size * sizeof(int)));
     location_stack = reinterpret_cast<AST::SourceLocation*> (realloc(location_stack, stack_size * sizeof(AST::SourceLocation)));
-    string_stack = reinterpret_cast<QStringRef*> (realloc(string_stack, stack_size * sizeof(QStringRef)));
+    string_stack = reinterpret_cast<QStringRef*> (realloc(static_cast<void *>(string_stack), stack_size * sizeof(QStringRef)));
 }
 
 Parser::Parser(Engine *engine):
diff --git a/src/qml/qml/ftw/qpodvector_p.h b/src/qml/qml/ftw/qpodvector_p.h
index d0e4f89741..b2fb481793 100644
--- a/src/qml/qml/ftw/qpodvector_p.h
+++ b/src/qml/qml/ftw/qpodvector_p.h
@@ -87,11 +87,11 @@ public:
     void insert(int idx, const T &v) {
         if (m_count == m_capacity) {
             m_capacity += Increment;
-            m_data = (T *)realloc(m_data, m_capacity * sizeof(T));
+            m_data = (T *)realloc(static_cast<void *>(m_data), m_capacity * sizeof(T));
         }
         int moveCount = m_count - idx;
         if (moveCount)
-            ::memmove(m_data + idx + 1, m_data + idx, moveCount * sizeof(T));
+            ::memmove(static_cast<void *>(m_data + idx + 1), static_cast<const void *>(m_data + idx), moveCount * sizeof(T));
         m_count++;
         m_data[idx] = v;
     }
@@ -99,7 +99,7 @@ public:
     void reserve(int count) {
         if (count >= m_capacity) {
             m_capacity = (count + (Increment-1)) & (0xFFFFFFFF - Increment + 1);
-            m_data = (T *)realloc(m_data, m_capacity * sizeof(T));
+            m_data = (T *)realloc(static_cast<void *>(m_data), m_capacity * sizeof(T));
         }
     }
 
@@ -108,7 +108,7 @@ public:
         reserve(newSize);
         int moveCount = m_count - idx;
         if (moveCount)
-            ::memmove(m_data + idx + count,  m_data + idx,
+            ::memmove(static_cast<void *>(m_data + idx + count),  static_cast<const void *>(m_data + idx),
                       moveCount * sizeof(T));
         m_count = newSize;
     }
@@ -116,7 +116,7 @@ public:
     void remove(int idx, int count = 1) {
         int moveCount = m_count - (idx + count);
         if (moveCount)
-            ::memmove(m_data + idx, m_data + idx + count,
+            ::memmove(static_cast<void *>(m_data + idx), static_cast<const void *>(m_data + idx + count),
                       moveCount * sizeof(T));
         m_count -= count;
     }
diff --git a/src/qml/qml/qqmlapplicationengine.h b/src/qml/qml/qqmlapplicationengine.h
index d0f9e6d319..bb5d6b5d68 100644
--- a/src/qml/qml/qqmlapplicationengine.h
+++ b/src/qml/qml/qqmlapplicationengine.h
@@ -56,7 +56,7 @@ public:
     QQmlApplicationEngine(QObject *parent = nullptr);
     QQmlApplicationEngine(const QUrl &url, QObject *parent = nullptr);
     QQmlApplicationEngine(const QString &filePath, QObject *parent = nullptr);
-    ~QQmlApplicationEngine();
+    ~QQmlApplicationEngine() override;
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QList<QObject*> rootObjects(); // ### Qt 6: remove
diff --git a/src/qml/qml/qqmlbinding_p.h b/src/qml/qml/qqmlbinding_p.h
index 8bc9554a42..19ec3f5d4f 100644
--- a/src/qml/qml/qqmlbinding_p.h
+++ b/src/qml/qml/qqmlbinding_p.h
@@ -79,7 +79,7 @@ public:
                                QObject *obj, QQmlContextData *ctxt, QV4::ExecutionContext *scope);
     static QQmlBinding *createTranslationBinding(QV4::CompiledData::CompilationUnit *unit, const QV4::CompiledData::Binding *binding,
                                                  QObject *obj, QQmlContextData *ctxt);
-    ~QQmlBinding();
+    ~QQmlBinding() override;
 
     void setTarget(const QQmlProperty &);
     void setTarget(QObject *, const QQmlPropertyData &, const QQmlPropertyData *valueType);
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h
index d3e584fd13..01094a11f7 100644
--- a/src/qml/qml/qqmlboundsignal_p.h
+++ b/src/qml/qml/qqmlboundsignal_p.h
@@ -92,7 +92,7 @@ public:
     QQmlEngine *engine() const { return context() ? context()->engine : nullptr; }
 
 private:
-    ~QQmlBoundSignalExpression();
+    ~QQmlBoundSignalExpression() override;
 
     void init(QQmlContextData *ctxt, QObject *scope);
 
diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h
index b8cc556e4a..444b3ec46c 100644
--- a/src/qml/qml/qqmlcomponent.h
+++ b/src/qml/qml/qqmlcomponent.h
@@ -83,7 +83,7 @@ public:
     QQmlComponent(QQmlEngine *, const QString &fileName, CompilationMode mode, QObject *parent = nullptr);
     QQmlComponent(QQmlEngine *, const QUrl &url, QObject *parent = nullptr);
     QQmlComponent(QQmlEngine *, const QUrl &url, CompilationMode mode, QObject *parent = nullptr);
-    virtual ~QQmlComponent();
+    ~QQmlComponent() override;
 
     enum Status { Null, Ready, Loading, Error };
     Q_ENUM(Status)
diff --git a/src/qml/qml/qqmlcontext.h b/src/qml/qml/qqmlcontext.h
index 506ae216b2..7ed70c7619 100644
--- a/src/qml/qml/qqmlcontext.h
+++ b/src/qml/qml/qqmlcontext.h
@@ -68,7 +68,7 @@ public:
 
     QQmlContext(QQmlEngine *parent, QObject *objParent = nullptr);
     QQmlContext(QQmlContext *parent, QObject *objParent = nullptr);
-    virtual ~QQmlContext();
+    ~QQmlContext() override;
 
     bool isValid() const;
 
diff --git a/src/qml/qml/qqmldelayedcallqueue_p.h b/src/qml/qml/qqmldelayedcallqueue_p.h
index 47e211829c..7962318561 100644
--- a/src/qml/qml/qqmldelayedcallqueue_p.h
+++ b/src/qml/qml/qqmldelayedcallqueue_p.h
@@ -65,7 +65,7 @@ class QQmlDelayedCallQueue : public QObject
     Q_OBJECT
 public:
     QQmlDelayedCallQueue();
-    ~QQmlDelayedCallQueue();
+    ~QQmlDelayedCallQueue() override;
 
     void init(QV4::ExecutionEngine *);
 
diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h
index 937920e191..73ad2754c8 100644
--- a/src/qml/qml/qqmlengine.h
+++ b/src/qml/qml/qqmlengine.h
@@ -97,7 +97,7 @@ class Q_QML_EXPORT QQmlEngine : public QJSEngine
     Q_OBJECT
 public:
     explicit QQmlEngine(QObject *p = nullptr);
-    virtual ~QQmlEngine();
+    ~QQmlEngine() override;
 
     QQmlContext *rootContext() const;
 
diff --git a/src/qml/qml/qqmlengine_p.h b/src/qml/qml/qqmlengine_p.h
index 2dfbd42e57..d6110c6699 100644
--- a/src/qml/qml/qqmlengine_p.h
+++ b/src/qml/qml/qqmlengine_p.h
@@ -122,7 +122,7 @@ class Q_QML_PRIVATE_EXPORT QQmlEnginePrivate : public QJSEnginePrivate
     Q_DECLARE_PUBLIC(QQmlEngine)
 public:
     QQmlEnginePrivate(QQmlEngine *);
-    ~QQmlEnginePrivate();
+    ~QQmlEnginePrivate() override;
 
     void init();
     // No mutex protecting baseModulesUninitialized, because use outside QQmlEngine
@@ -341,7 +341,7 @@ void QQmlEnginePrivate::deleteInEngineThread(T *value)
     } else {
         struct I : public Deletable {
             I(T *value) : value(value) {}
-            ~I() { delete value; }
+            ~I() override { delete value; }
             T *value;
         };
         I *i = new I(value);
diff --git a/src/qml/qml/qqmlexpression.h b/src/qml/qml/qqmlexpression.h
index e9c8770e92..0eceeb12e1 100644
--- a/src/qml/qml/qqmlexpression.h
+++ b/src/qml/qml/qqmlexpression.h
@@ -62,7 +62,7 @@ public:
     QQmlExpression();
     QQmlExpression(QQmlContext *, QObject *, const QString &, QObject * = nullptr);
     explicit QQmlExpression(const QQmlScriptString &, QQmlContext * = nullptr, QObject * = nullptr, QObject * = nullptr);
-    virtual ~QQmlExpression();
+    ~QQmlExpression() override;
 
     QQmlEngine *engine() const;
     QQmlContext *context() const;
diff --git a/src/qml/qml/qqmlexpression_p.h b/src/qml/qml/qqmlexpression_p.h
index 55059575e1..da10b31b2c 100644
--- a/src/qml/qml/qqmlexpression_p.h
+++ b/src/qml/qml/qqmlexpression_p.h
@@ -68,7 +68,7 @@ class QQmlExpressionPrivate : public QObjectPrivate,
     Q_DECLARE_PUBLIC(QQmlExpression)
 public:
     QQmlExpressionPrivate();
-    ~QQmlExpressionPrivate();
+    ~QQmlExpressionPrivate() override;
 
     void init(QQmlContextData *, const QString &, QObject *);
     void init(QQmlContextData *, QV4::Function *runtimeFunction, QObject *);
diff --git a/src/qml/qml/qqmlextensioninterface.h b/src/qml/qml/qqmlextensioninterface.h
index 62b9b26569..c2d20ef0a3 100644
--- a/src/qml/qml/qqmlextensioninterface.h
+++ b/src/qml/qml/qqmlextensioninterface.h
@@ -58,7 +58,7 @@ public:
 class Q_QML_EXPORT QQmlExtensionInterface : public QQmlTypesExtensionInterface
 {
 public:
-    virtual ~QQmlExtensionInterface() {}
+    ~QQmlExtensionInterface() override {}
     virtual void initializeEngine(QQmlEngine *engine, const char *uri) = 0;
 };
 
diff --git a/src/qml/qml/qqmlextensionplugin.h b/src/qml/qml/qqmlextensionplugin.h
index 84a46fb93e..55e9b89dae 100644
--- a/src/qml/qml/qqmlextensionplugin.h
+++ b/src/qml/qml/qqmlextensionplugin.h
@@ -59,7 +59,7 @@ class Q_QML_EXPORT QQmlExtensionPlugin
     Q_INTERFACES(QQmlTypesExtensionInterface)
 public:
     explicit QQmlExtensionPlugin(QObject *parent = nullptr);
-    ~QQmlExtensionPlugin();
+    ~QQmlExtensionPlugin() override;
 
     QUrl baseUrl() const;
 
diff --git a/src/qml/qml/qqmlfileselector.h b/src/qml/qml/qqmlfileselector.h
index 4eaf92c918..9b70e3936d 100644
--- a/src/qml/qml/qqmlfileselector.h
+++ b/src/qml/qml/qqmlfileselector.h
@@ -55,7 +55,7 @@ class Q_QML_EXPORT QQmlFileSelector : public QObject
     Q_DECLARE_PRIVATE(QQmlFileSelector)
 public:
     explicit QQmlFileSelector(QQmlEngine *engine, QObject *parent = nullptr);
-    ~QQmlFileSelector();
+    ~QQmlFileSelector() override;
     QFileSelector *selector() const Q_DECL_NOTHROW;
     void setSelector(QFileSelector *selector);
     void setExtraSelectors(QStringList &strings); // TODO Qt6: remove
diff --git a/src/qml/qml/qqmlopenmetaobject_p.h b/src/qml/qml/qqmlopenmetaobject_p.h
index bb5477dfbf..4905190b75 100644
--- a/src/qml/qml/qqmlopenmetaobject_p.h
+++ b/src/qml/qml/qqmlopenmetaobject_p.h
@@ -69,7 +69,7 @@ class Q_QML_PRIVATE_EXPORT QQmlOpenMetaObjectType : public QQmlRefCount, public
 {
 public:
     QQmlOpenMetaObjectType(const QMetaObject *base, QQmlEngine *engine);
-    ~QQmlOpenMetaObjectType();
+    ~QQmlOpenMetaObjectType() override;
 
     void createProperties(const QVector<QByteArray> &names);
     int createProperty(const QByteArray &name);
@@ -97,7 +97,7 @@ class Q_QML_PRIVATE_EXPORT QQmlOpenMetaObject : public QAbstractDynamicMetaObjec
 public:
     QQmlOpenMetaObject(QObject *, const QMetaObject * = nullptr, bool = true);
     QQmlOpenMetaObject(QObject *, QQmlOpenMetaObjectType *, bool = true);
-    ~QQmlOpenMetaObject();
+    ~QQmlOpenMetaObject() override;
 
     QVariant value(const QByteArray &) const;
     bool setValue(const QByteArray &, const QVariant &);
diff --git a/src/qml/qml/qqmlprivate.h b/src/qml/qml/qqmlprivate.h
index 11adea6fc9..fabdcacc36 100644
--- a/src/qml/qml/qqmlprivate.h
+++ b/src/qml/qml/qqmlprivate.h
@@ -98,7 +98,7 @@ namespace QQmlPrivate
     class QQmlElement : public T
     {
     public:
-        virtual ~QQmlElement() {
+        ~QQmlElement() override {
             QQmlPrivate::qdeclarativeelement_destructor(this);
         }
     };
diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index 7b04ba11b8..51a191a41f 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -394,7 +394,7 @@ class Q_QML_PRIVATE_EXPORT QQmlPropertyCache : public QQmlRefCount
 public:
     QQmlPropertyCache();
     QQmlPropertyCache(const QMetaObject *);
-    virtual ~QQmlPropertyCache();
+    ~QQmlPropertyCache() override;
 
     void update(const QMetaObject *);
     void invalidate(const QMetaObject *);
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index ed1526c0a9..a107bb42ce 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -3015,7 +3015,7 @@ void QQmlScriptBlob::dataReceived(const SourceCodeData &data)
     // The js unit owns the data and will free the qml unit.
     unit->data = unitData;
 
-    if (!disableDiskCache() || forceDiskCache()) {
+    if ((!disableDiskCache() || forceDiskCache()) && !isDebugging()) {
         QString errorString;
         if (!unit->saveToDisk(url(), &errorString)) {
             qCDebug(DBG_DISK_CACHE()) << "Error saving cached version of" << unit->fileName() << "to disk:" << errorString;
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h
index f2327e9a5f..713f707387 100644
--- a/src/qml/qml/qqmltypeloader_p.h
+++ b/src/qml/qml/qqmltypeloader_p.h
@@ -110,7 +110,7 @@ public:
     };
 
     QQmlDataBlob(const QUrl &, Type, QQmlTypeLoader* manager);
-    virtual ~QQmlDataBlob();
+    ~QQmlDataBlob() override;
 
     void startLoading();
 
@@ -262,7 +262,7 @@ public:
     {
     public:
         Blob(const QUrl &url, QQmlDataBlob::Type type, QQmlTypeLoader *loader);
-        ~Blob();
+        ~Blob() override;
 
         const QQmlImports &imports() const { return m_importCache; }
 
@@ -438,7 +438,7 @@ private:
     QQmlTypeData(const QUrl &, QQmlTypeLoader *);
 
 public:
-    ~QQmlTypeData();
+    ~QQmlTypeData() override;
 
     const QList<ScriptReference> &resolvedScripts() const;
 
@@ -523,7 +523,7 @@ private:
     QQmlScriptData();
 
 public:
-    ~QQmlScriptData();
+    ~QQmlScriptData() override;
 
     QUrl url;
     QString urlString;
@@ -554,7 +554,7 @@ private:
     QQmlScriptBlob(const QUrl &, QQmlTypeLoader *);
 
 public:
-    ~QQmlScriptBlob();
+    ~QQmlScriptBlob() override;
 
     struct ScriptReference
     {
diff --git a/src/qml/qml/qqmltypenamecache_p.h b/src/qml/qml/qqmltypenamecache_p.h
index c2f7a70d03..28b5e7f0ad 100644
--- a/src/qml/qml/qqmltypenamecache_p.h
+++ b/src/qml/qml/qqmltypenamecache_p.h
@@ -85,7 +85,7 @@ class Q_QML_PRIVATE_EXPORT QQmlTypeNameCache : public QQmlRefCount
 {
 public:
     QQmlTypeNameCache(const QQmlImports &imports);
-    virtual ~QQmlTypeNameCache();
+    ~QQmlTypeNameCache() override;
 
     inline bool isEmpty() const;
 
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index 7d8473db0e..4ea71e8955 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -67,7 +67,7 @@ class Q_QML_PRIVATE_EXPORT QQmlValueType : public QObject, public QAbstractDynam
 {
 public:
     QQmlValueType(int userType, const QMetaObject *metaObject);
-    ~QQmlValueType();
+    ~QQmlValueType() override;
     void read(QObject *, int);
     void write(QObject *, int, QQmlPropertyData::WriteFlags flags);
     QVariant value();
diff --git a/src/qml/qml/qqmlvmemetaobject_p.h b/src/qml/qml/qqmlvmemetaobject_p.h
index 1da79b8a81..0c82686d47 100644
--- a/src/qml/qml/qqmlvmemetaobject_p.h
+++ b/src/qml/qml/qqmlvmemetaobject_p.h
@@ -81,7 +81,7 @@ class QQmlVMEVariantQObjectPtr : public QQmlGuard<QObject>
 {
 public:
     inline QQmlVMEVariantQObjectPtr();
-    inline ~QQmlVMEVariantQObjectPtr();
+    inline ~QQmlVMEVariantQObjectPtr() override;
 
     inline void objectDestroyed(QObject *) override;
     inline void setGuardedValue(QObject *obj, QQmlVMEMetaObject *target, int index);
@@ -95,7 +95,7 @@ class Q_QML_PRIVATE_EXPORT QQmlInterceptorMetaObject : public QAbstractDynamicMe
 {
 public:
     QQmlInterceptorMetaObject(QObject *obj, QQmlPropertyCache *cache);
-    ~QQmlInterceptorMetaObject();
+    ~QQmlInterceptorMetaObject() override;
 
     void registerInterceptor(QQmlPropertyIndex index, QQmlPropertyValueInterceptor *interceptor);
 
@@ -147,7 +147,7 @@ class Q_QML_PRIVATE_EXPORT QQmlVMEMetaObject : public QQmlInterceptorMetaObject
 {
 public:
     QQmlVMEMetaObject(QV4::ExecutionEngine *engine, QObject *obj, QQmlPropertyCache *cache, QV4::CompiledData::CompilationUnit *qmlCompilationUnit, int qmlObjectId);
-    ~QQmlVMEMetaObject();
+    ~QQmlVMEMetaObject() override;
 
     bool aliasTarget(int index, QObject **target, int *coreIndex, int *valueTypeIndex) const;
     QV4::ReturnedValue vmeMethod(int index) const;
diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h
index 3930ac00a8..cb7ada3d79 100644
--- a/src/qml/util/qqmlpropertymap.h
+++ b/src/qml/util/qqmlpropertymap.h
@@ -56,7 +56,7 @@ class Q_QML_EXPORT QQmlPropertyMap : public QObject
     Q_OBJECT
 public:
     explicit QQmlPropertyMap(QObject *parent = nullptr);
-    virtual ~QQmlPropertyMap();
+    ~QQmlPropertyMap() override;
 
     QVariant value(const QString &key) const;
     void insert(const QString &key, const QVariant &value);