diff options
| author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-01-19 15:58:32 +0200 |
|---|---|---|
| committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2022-01-21 12:51:35 +0000 |
| commit | ba09df11ecb7b42dd1c2e9b85d5ebd9edf90984d (patch) | |
| tree | dde783715139f194ab6f30c01a93b524fc255286 /tests | |
| parent | 6233bf7d5645f9b8b4dcd99b1d3691ed15f9829c (diff) | |
Make 'override' specifier usage consistent
Add where missing. Replace occurrences of Q_DECL_OVERRIDE macro,
building IFW requires a C++11 compatible compiler so the language
specifier is preferred.
Change-Id: Idb75e2813d26b9da85e03891f0ae9537c6524c56
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/installer/factory/tst_factory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/installer/factory/tst_factory.cpp b/tests/auto/installer/factory/tst_factory.cpp index eb7e2c36c..ead282599 100644 --- a/tests/auto/installer/factory/tst_factory.cpp +++ b/tests/auto/installer/factory/tst_factory.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -82,7 +82,7 @@ public: : Food(amount) , m_expireDate(expireDate) { qDebug().nospace().noquote() << "Constructor."; } - QDate expireDate() const Q_DECL_OVERRIDE { + QDate expireDate() const override { return m_expireDate; } private: @@ -92,7 +92,7 @@ private: class Butter : public Food { public: - QDate expireDate() const Q_DECL_OVERRIDE { + QDate expireDate() const override { return m_expireDate; } static Food *create(int amount, const QDate expireDate) { @@ -117,7 +117,7 @@ public: : Food(amount) , m_expireDate(expireDate) { qDebug().nospace().noquote() << "Constructor."; } - QDate expireDate() const Q_DECL_OVERRIDE { + QDate expireDate() const override { return m_expireDate; } |