aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h2
-rw-r--r--src/qml/jit/qv4assemblercommon.cpp4
-rw-r--r--src/qml/qml/qqmlirloader.cpp4
-rw-r--r--src/qml/qml/qqmlpropertybinding_p.h2
-rw-r--r--src/quick/items/qquickpalette_p.h2
-rw-r--r--src/quick/items/qquickpaletteproviderprivatebase_p.h4
6 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h
index f7f343a4ee..5dc867b763 100644
--- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h
+++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.h
@@ -104,7 +104,7 @@ signals:
void fps(const FpsInfo &info);
protected:
- bool eventFilter(QObject *obj, QEvent *event);
+ bool eventFilter(QObject *obj, QEvent *event) override;
private:
void doZoom();
void tryCreateObject();
diff --git a/src/qml/jit/qv4assemblercommon.cpp b/src/qml/jit/qv4assemblercommon.cpp
index cc8af723b2..27b658ab72 100644
--- a/src/qml/jit/qv4assemblercommon.cpp
+++ b/src/qml/jit/qv4assemblercommon.cpp
@@ -76,7 +76,7 @@ public:
~QIODevicePrintStream()
{}
- void vprintf(const char* format, va_list argList) WTF_ATTRIBUTE_PRINTF(2, 0)
+ void vprintf(const char* format, va_list argList) override WTF_ATTRIBUTE_PRINTF(2, 0)
{
const int written = qvsnprintf(buf.data(), buf.size(), format, argList);
if (written > 0)
@@ -84,7 +84,7 @@ public:
memset(buf.data(), 0, qMin(written, buf.size()));
}
- void flush()
+ void flush() override
{}
private:
diff --git a/src/qml/qml/qqmlirloader.cpp b/src/qml/qml/qqmlirloader.cpp
index f66094fad7..a0ae923bac 100644
--- a/src/qml/qml/qqmlirloader.cpp
+++ b/src/qml/qml/qqmlirloader.cpp
@@ -78,10 +78,10 @@ struct FakeExpression : public QQmlJS::AST::NullExpression
: location(start, length)
{}
- virtual QQmlJS::SourceLocation firstSourceLocation() const
+ QQmlJS::SourceLocation firstSourceLocation() const override
{ return location; }
- virtual QQmlJS::SourceLocation lastSourceLocation() const
+ QQmlJS::SourceLocation lastSourceLocation() const override
{ return location; }
private:
diff --git a/src/qml/qml/qqmlpropertybinding_p.h b/src/qml/qml/qqmlpropertybinding_p.h
index 086ab1615d..6a5bd5eeea 100644
--- a/src/qml/qml/qqmlpropertybinding_p.h
+++ b/src/qml/qml/qqmlpropertybinding_p.h
@@ -69,7 +69,7 @@ public:
QObject *obj, const QQmlRefPointer<QQmlContextData> &ctxt,
QV4::ExecutionContext *scope);
- virtual void expressionChanged();
+ void expressionChanged() override;
private:
QQmlPropertyBinding(const QMetaType &metaType);
diff --git a/src/quick/items/qquickpalette_p.h b/src/quick/items/qquickpalette_p.h
index 11688048ed..7d5fc17f26 100644
--- a/src/quick/items/qquickpalette_p.h
+++ b/src/quick/items/qquickpalette_p.h
@@ -78,7 +78,7 @@ public:
QQuickColorGroup *inactive() const;
QQuickColorGroup *disabled() const;
- QPalette::ColorGroup currentColorGroup() const;
+ QPalette::ColorGroup currentColorGroup() const override;
void setCurrentGroup(QPalette::ColorGroup currentGroup);
void fromQPalette(QPalette palette);
diff --git a/src/quick/items/qquickpaletteproviderprivatebase_p.h b/src/quick/items/qquickpaletteproviderprivatebase_p.h
index 2461b2d1a9..8f8251f251 100644
--- a/src/quick/items/qquickpaletteproviderprivatebase_p.h
+++ b/src/quick/items/qquickpaletteproviderprivatebase_p.h
@@ -122,14 +122,14 @@ public:
A default palette for this component.
*/
- virtual QPalette defaultPalette() const;
+ QPalette defaultPalette() const override;
/*!
\internal
A parent palette for this component. Can be null.
*/
- virtual QPalette parentPalette() const;
+ QPalette parentPalette() const override;
/*!
\internal