Clazy: modernize

Change-Id: I8abe9b5b62d255b93754af84b82fbf88ca9b78a4
Pick-to: 6.7
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

41 files changed, 155 insertions, 155 deletions

diff --git a/src/application-lib/packageinfo.cpp b/src/application-lib/packageinfo.cpp
index e1f98949..a2c27831 100644
--- a/src/application-lib/packageinfo.cpp
+++ b/src/application-lib/packageinfo.cpp
@@ -27,7 +27,7 @@ PackageInfo::~PackageInfo()
     qDeleteAll(m_applications);
 }
 
-void PackageInfo::validate() const Q_DECL_NOEXCEPT_EXPR(false)
+void PackageInfo::validate() const noexcept(false)
 {
     QString errorMsg;
     if (!isValidApplicationId(id(), &errorMsg))
diff --git a/src/application-lib/packageinfo.h b/src/application-lib/packageinfo.h
index 96275717..439deb92 100644
--- a/src/application-lib/packageinfo.h
+++ b/src/application-lib/packageinfo.h
@@ -31,7 +31,7 @@ public:
 
     static quint32 dataStreamVersion();
 
-    void validate() const Q_DECL_NOEXCEPT_EXPR(false);
+    void validate() const noexcept(false);
 
     QString id() const;
 
diff --git a/src/application-lib/packagescanner.h b/src/application-lib/packagescanner.h
index 5d511554..b0b1b2f4 100644
--- a/src/application-lib/packagescanner.h
+++ b/src/application-lib/packagescanner.h
@@ -18,8 +18,8 @@ class PackageScanner
 public:
     virtual ~PackageScanner() = default;
 
-    virtual PackageInfo *scan(const QString &fileName) Q_DECL_NOEXCEPT_EXPR(false) = 0;
-    virtual PackageInfo *scan(QIODevice *source, const QString &fileName) Q_DECL_NOEXCEPT_EXPR(false) = 0;
+    virtual PackageInfo *scan(const QString &fileName) noexcept(false) = 0;
+    virtual PackageInfo *scan(QIODevice *source, const QString &fileName) noexcept(false) = 0;
 
 protected:
     PackageScanner() = default;
diff --git a/src/application-lib/yamlpackagescanner.cpp b/src/application-lib/yamlpackagescanner.cpp
index 2f927c82..4b832ef3 100644
--- a/src/application-lib/yamlpackagescanner.cpp
+++ b/src/application-lib/yamlpackagescanner.cpp
@@ -26,7 +26,7 @@ using namespace Qt::StringLiterals;
 
 QT_BEGIN_NAMESPACE_AM
 
-PackageInfo *YamlPackageScanner::scan(const QString &fileName) Q_DECL_NOEXCEPT_EXPR(false)
+PackageInfo *YamlPackageScanner::scan(const QString &fileName) noexcept(false)
 {
     QFile f(fileName);
     if (!f.open(QIODevice::ReadOnly))
@@ -34,7 +34,7 @@ PackageInfo *YamlPackageScanner::scan(const QString &fileName) Q_DECL_NOEXCEPT_E
     return scan(&f, f.fileName());
 }
 
-PackageInfo *YamlPackageScanner::scan(QIODevice *source, const QString &fileName) Q_DECL_NOEXCEPT_EXPR(false)
+PackageInfo *YamlPackageScanner::scan(QIODevice *source, const QString &fileName) noexcept(false)
 {
     try {
         YamlParser p(source->readAll());
diff --git a/src/application-lib/yamlpackagescanner.h b/src/application-lib/yamlpackagescanner.h
index b9663a48..2bb326ba 100644
--- a/src/application-lib/yamlpackagescanner.h
+++ b/src/application-lib/yamlpackagescanner.h
@@ -16,8 +16,8 @@ class YamlPackageScanner : public PackageScanner
 public:
     YamlPackageScanner() = default;
 
-    PackageInfo *scan(const QString &filePath) Q_DECL_NOEXCEPT_EXPR(false) override;
-    PackageInfo *scan(QIODevice *source, const QString &filePath) Q_DECL_NOEXCEPT_EXPR(false) override;
+    PackageInfo *scan(const QString &filePath) noexcept(false) override;
+    PackageInfo *scan(QIODevice *source, const QString &filePath) noexcept(false) override;
 };
 
 QT_END_NAMESPACE_AM
diff --git a/src/application-main-lib/applicationmain.cpp b/src/application-main-lib/applicationmain.cpp
index 8640f9dc..27caf62c 100644
--- a/src/application-main-lib/applicationmain.cpp
+++ b/src/application-main-lib/applicationmain.cpp
@@ -73,7 +73,7 @@ ApplicationMain *ApplicationMain::instance()
     return s_instance;
 }
 
-void ApplicationMain::registerWaylandExtensions() Q_DECL_NOEXCEPT
+void ApplicationMain::registerWaylandExtensions() noexcept
 {
 #if defined(QT_WAYLANDCLIENT_LIB)
      m_waylandExtension.reset(new WaylandQtAMClientExtension());
@@ -234,7 +234,7 @@ void ApplicationMain::setup()
     connectDBusInterfaces();
 }
 
-void ApplicationMain::loadConfiguration(const QByteArray &configYaml) Q_DECL_NOEXCEPT_EXPR(false)
+void ApplicationMain::loadConfiguration(const QByteArray &configYaml) noexcept(false)
 {
     try {
         QVector<QVariant> docs = YamlParser::parseAllDocuments(configYaml.isEmpty() ? qgetenv("AM_CONFIG")
@@ -286,7 +286,7 @@ void ApplicationMain::loadConfiguration(const QByteArray &configYaml) Q_DECL_NOE
         throw Exception("Runtime launcher received no D-Bus configuration");
 }
 
-void ApplicationMain::setupDBusConnections() Q_DECL_NOEXCEPT_EXPR(false)
+void ApplicationMain::setupDBusConnections() noexcept(false)
 {
     if (m_dbusAddressP2P.isEmpty())
         throw Exception("No address available to connect to the P2P D-Bus");
@@ -348,7 +348,7 @@ static T *tryConnectToDBusInterface(const QString &service, const QString &path,
     return nullptr;
 }
 
-void ApplicationMain::connectDBusInterfaces(bool isRuntimeLauncher) Q_DECL_NOEXCEPT_EXPR(false)
+void ApplicationMain::connectDBusInterfaces(bool isRuntimeLauncher) noexcept(false)
 {
     m_dbusApplicationInterface = tryConnectToDBusInterface<IoQtApplicationManagerApplicationInterfaceInterface>(
         { }, u"/ApplicationInterface"_s, p2pDBusName(), this);
diff --git a/src/application-main-lib/applicationmain.h b/src/application-main-lib/applicationmain.h
index 6f3773fe..1d374dfc 100644
--- a/src/application-main-lib/applicationmain.h
+++ b/src/application-main-lib/applicationmain.h
@@ -36,17 +36,17 @@ class ApplicationMain : public ApplicationMainBase, public SharedMain
 {
     Q_OBJECT
 public:
-    ApplicationMain(int &argc, char **argv) Q_DECL_NOEXCEPT;
-    virtual ~ApplicationMain();
+    ApplicationMain(int &argc, char **argv) noexcept;
+    virtual ~ApplicationMain() override;
 
     static ApplicationMain *instance();
 
 public:
-    void setup() Q_DECL_NOEXCEPT(false);
-    void loadConfiguration(const QByteArray &configYaml = QByteArray()) Q_DECL_NOEXCEPT_EXPR(false);
-    void setupDBusConnections() Q_DECL_NOEXCEPT_EXPR(false);
-    void connectDBusInterfaces(bool isRuntimeLauncher = false) Q_DECL_NOEXCEPT_EXPR(false);
-    void registerWaylandExtensions() Q_DECL_NOEXCEPT;
+    void setup() noexcept(false);
+    void loadConfiguration(const QByteArray &configYaml = QByteArray()) noexcept(false);
+    void setupDBusConnections() noexcept(false);
+    void connectDBusInterfaces(bool isRuntimeLauncher = false) noexcept(false);
+    void registerWaylandExtensions() noexcept;
 
     // D-Bus names (use with QDBusConnection)
     QString p2pDBusName() const;
diff --git a/src/application-main-lib/intentclientdbusimplementation.cpp b/src/application-main-lib/intentclientdbusimplementation.cpp
index e97e927b..69d49836 100644
--- a/src/application-main-lib/intentclientdbusimplementation.cpp
+++ b/src/application-main-lib/intentclientdbusimplementation.cpp
@@ -33,7 +33,7 @@ QString IntentClientDBusImplementation::currentApplicationId(QObject *hint)
     return ApplicationMain::instance()->applicationId();
 }
 
-void IntentClientDBusImplementation::initialize(IntentClient *intentClient) Q_DECL_NOEXCEPT_EXPR(false)
+void IntentClientDBusImplementation::initialize(IntentClient *intentClient) noexcept(false)
 {
     IntentClientSystemInterface::initialize(intentClient);
 
diff --git a/src/application-main-lib/intentclientdbusimplementation.h b/src/application-main-lib/intentclientdbusimplementation.h
index 51b6a0b2..bc80c096 100644
--- a/src/application-main-lib/intentclientdbusimplementation.h
+++ b/src/application-main-lib/intentclientdbusimplementation.h
@@ -17,7 +17,7 @@ class IntentClientDBusImplementation : public IntentClientSystemInterface
 public:
     IntentClientDBusImplementation(const QString &dbusName, QObject *parent = nullptr);
 
-    void initialize(IntentClient *intentClient) Q_DECL_NOEXCEPT_EXPR(false) override;
+    void initialize(IntentClient *intentClient) noexcept(false) override;
 
     QString currentApplicationId(QObject *hint) override;
 
diff --git a/src/common-lib/exception.cpp b/src/common-lib/exception.cpp
index d00412d9..2421a18c 100644
--- a/src/common-lib/exception.cpp
+++ b/src/common-lib/exception.cpp
@@ -10,59 +10,59 @@
 
 QT_BEGIN_NAMESPACE_AM
 
-Exception::Exception(const char *errorString) Q_DECL_NOEXCEPT
+Exception::Exception(const char *errorString) noexcept
     : m_errorCode(Error::System)
     , m_errorString(errorString ? QString::fromLatin1(errorString) : QString())
 { }
 
-Exception::Exception(const QString &errorString) Q_DECL_NOEXCEPT
+Exception::Exception(const QString &errorString) noexcept
     : m_errorCode(Error::System)
     , m_errorString(errorString)
 { }
 
-Exception::Exception(Error errorCode, const char *errorString) Q_DECL_NOEXCEPT
+Exception::Exception(Error errorCode, const char *errorString) noexcept
     : m_errorCode(errorCode)
     , m_errorString(errorString ? QString::fromLatin1(errorString) : QString())
 { }
 
-Exception::Exception(Error errorCode, const QString &errorString) Q_DECL_NOEXCEPT
+Exception::Exception(Error errorCode, const QString &errorString) noexcept
     : m_errorCode(errorCode)
     , m_errorString(errorString)
 { }
 
-Exception::Exception(int _errno, const char *errorString) Q_DECL_NOEXCEPT
+Exception::Exception(int _errno, const char *errorString) noexcept
     : m_errorCode(_errno == EACCES ? Error::Permissions : Error::IO)
     , m_errorString(QString::fromLatin1(errorString) + u": " + QString::fromLocal8Bit(strerror(_errno)))
 { }
 
-Exception::Exception(const QFileDevice &file, const char *errorString) Q_DECL_NOEXCEPT
+Exception::Exception(const QFileDevice &file, const char *errorString) noexcept
     : m_errorCode(file.error() == QFileDevice::PermissionsError ? Error::Permissions : Error::IO)
     , m_errorString(QString::fromLatin1(errorString) + u" (" + file.fileName() + u"): " + file.errorString())
 { }
 
-Exception::Exception(const Exception &copy) Q_DECL_NOEXCEPT
+Exception::Exception(const Exception &copy) noexcept
     : m_errorCode(copy.m_errorCode)
     , m_errorString(copy.m_errorString)
 { }
 
-Exception::Exception(Exception &&move) Q_DECL_NOEXCEPT
+Exception::Exception(Exception &&move) noexcept
     : m_errorCode(move.m_errorCode)
     , m_errorString(move.m_errorString)
 {
     std::swap(m_whatBuffer, move.m_whatBuffer);
 }
 
-Exception::~Exception() Q_DECL_NOEXCEPT
+Exception::~Exception() noexcept
 {
     delete m_whatBuffer;
 }
 
-Error Exception::errorCode() const Q_DECL_NOEXCEPT
+Error Exception::errorCode() const noexcept
 {
     return m_errorCode;
 }
 
-QString Exception::errorString() const Q_DECL_NOEXCEPT
+QString Exception::errorString() const noexcept
 {
     return m_errorString;
 }
@@ -72,12 +72,12 @@ void Exception::raise() const
     throw *this;
 }
 
-Exception *Exception::clone() const Q_DECL_NOEXCEPT
+Exception *Exception::clone() const noexcept
 {
     return new Exception(*this);
 }
 
-const char *Exception::what() const Q_DECL_NOEXCEPT
+const char *Exception::what() const noexcept
 {
     if (!m_whatBuffer)
         m_whatBuffer = new QByteArray;
diff --git a/src/common-lib/exception.h b/src/common-lib/exception.h
index 961ec0a6..83c40ed1 100644
--- a/src/common-lib/exception.h
+++ b/src/common-lib/exception.h
@@ -21,31 +21,31 @@ QT_BEGIN_NAMESPACE_AM
 class Exception : public QException
 {
 public:
-    explicit Exception(const char *errorString) Q_DECL_NOEXCEPT;
-    explicit Exception(const QString &errorString) Q_DECL_NOEXCEPT;
-    explicit Exception(Error errorCode, const char *errorString = nullptr) Q_DECL_NOEXCEPT;
-    explicit Exception(Error errorCode, const QString &errorString) Q_DECL_NOEXCEPT;
-    explicit Exception(int _errno, const char *errorString) Q_DECL_NOEXCEPT;
-    explicit Exception(const QFileDevice &file, const char *errorString) Q_DECL_NOEXCEPT;
+    explicit Exception(const char *errorString) noexcept;
+    explicit Exception(const QString &errorString) noexcept;
+    explicit Exception(Error errorCode, const char *errorString = nullptr) noexcept;
+    explicit Exception(Error errorCode, const QString &errorString) noexcept;
+    explicit Exception(int _errno, const char *errorString) noexcept;
+    explicit Exception(const QFileDevice &file, const char *errorString) noexcept;
 
-    Exception(const Exception &copy) Q_DECL_NOEXCEPT;
-    Exception(Exception &&move) Q_DECL_NOEXCEPT;
+    Exception(const Exception &copy) noexcept;
+    Exception(Exception &&move) noexcept;
 
-    ~Exception() Q_DECL_NOEXCEPT;
+    ~Exception() noexcept override;
 
-    Error errorCode() const Q_DECL_NOEXCEPT;
-    QString errorString() const Q_DECL_NOEXCEPT;
+    Error errorCode() const noexcept;
+    QString errorString() const noexcept;
 
     void raise() const override;
-    Exception *clone() const Q_DECL_NOEXCEPT override;
+    Exception *clone() const noexcept override;
 
     // convenience
-    Exception &arg(const QByteArray &fileName) Q_DECL_NOEXCEPT
+    Exception &arg(const QByteArray &fileName) noexcept
     {
         m_errorString = m_errorString.arg(QString::fromLocal8Bit(fileName));
         return *this;
     }
-    Exception &arg(const QDir &dir) Q_DECL_NOEXCEPT
+    Exception &arg(const QDir &dir) noexcept
     {
         m_errorString = m_errorString.arg(dir.path());
         return *this;
@@ -53,7 +53,7 @@ public:
 
     // this will generate compiler errors if there's no suitable QString::arg(const C &) overload
     template <typename C> typename std::enable_if<QtPrivate::IsSequentialContainer<C>::Value, Exception>::type &
-    arg(const C &c) Q_DECL_NOEXCEPT
+    arg(const C &c) noexcept
     {
         QString s;
         for (int i = 0; i < c.size(); ++i) {
@@ -65,21 +65,21 @@ public:
         return *this;
     }
 
-    Exception &arg(const char *str) Q_DECL_NOEXCEPT
+    Exception &arg(const char *str) noexcept
     {
         m_errorString = m_errorString.arg(QString::fromUtf8(str));
         return *this;
     }
 
     // this will generate compiler errors if there's no suitable QString::arg(const Ts &) overload
-    template <typename... Ts> Exception &arg(const Ts & ...ts) Q_DECL_NOEXCEPT
+    template <typename... Ts> Exception &arg(const Ts & ...ts) noexcept
     {
         m_errorString = m_errorString.arg(ts...);
         return *this;
     }
 
     // shouldn't be used, but needed for std::exception compatibility
-    const char *what() const Q_DECL_NOEXCEPT override;
+    const char *what() const noexcept override;
 
 protected:
     Error m_errorCode;
diff --git a/src/common-lib/logging.cpp b/src/common-lib/logging.cpp
index a471b03a..c3e252d8 100644
--- a/src/common-lib/logging.cpp
+++ b/src/common-lib/logging.cpp
@@ -129,7 +129,7 @@ QDLT_FALLBACK_CATEGORY(LogGeneral)
 struct DeferredMessage
 {
     DeferredMessage(QtMsgType _msgType, const QMessageLogContext &_context, const QString &_message);
-    DeferredMessage(DeferredMessage &&other) Q_DECL_NOEXCEPT;
+    DeferredMessage(DeferredMessage &&other) noexcept;
     ~DeferredMessage();
 
     QtMsgType msgType;
@@ -218,7 +218,7 @@ DeferredMessage::DeferredMessage(QtMsgType _msgType, const QMessageLogContext &_
     category = qstrdup(_context.category);
 }
 
-DeferredMessage::DeferredMessage(DeferredMessage &&other) Q_DECL_NOEXCEPT
+DeferredMessage::DeferredMessage(DeferredMessage &&other) noexcept
     : msgType(other.msgType)
     , line(other.line)
     , file(other.file)
diff --git a/src/common-lib/qtyaml.cpp b/src/common-lib/qtyaml.cpp
index e8fef242..7dba5081 100644
--- a/src/common-lib/qtyaml.cpp
+++ b/src/common-lib/qtyaml.cpp
@@ -23,13 +23,13 @@ QT_BEGIN_NAMESPACE_AM
 
 namespace QtYaml {
 
-static inline void yerr(int result) Q_DECL_NOEXCEPT_EXPR(false)
+static inline void yerr(int result) noexcept(false)
 {
     if (!result)
         throw std::exception();
 }
 
-static void emitYamlScalar(yaml_emitter_t *e, const QByteArray &ba, bool quoting = false) Q_DECL_NOEXCEPT_EXPR(false)
+static void emitYamlScalar(yaml_emitter_t *e, const QByteArray &ba, bool quoting = false) noexcept(false)
 {
     yaml_event_t event;
     yerr(yaml_scalar_event_initialize(&event,
@@ -43,7 +43,7 @@ static void emitYamlScalar(yaml_emitter_t *e, const QByteArray &ba, bool quoting
     yerr(yaml_emitter_emit(e, &event));
 }
 
-static void emitYaml(yaml_emitter_t *e, const QVariant &value, YamlStyle style) Q_DECL_NOEXCEPT_EXPR(false)
+static void emitYaml(yaml_emitter_t *e, const QVariant &value, YamlStyle style) noexcept(false)
 {
     yaml_event_t event;
 
diff --git a/src/common-lib/utilities.cpp b/src/common-lib/utilities.cpp
index f9c7cfd7..497c5601 100644
--- a/src/common-lib/utilities.cpp
+++ b/src/common-lib/utilities.cpp
@@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE_AM
     Otherwise, the amount of documents is irrelevant.
 */
 YamlFormat checkYamlFormat(const QVector<QVariant> &docs, int numberOfDocuments,
-                           const QVector<YamlFormat> &formatTypesAndVersions) Q_DECL_NOEXCEPT_EXPR(false)
+                           const QVector<YamlFormat> &formatTypesAndVersions) noexcept(false)
 {
     qsizetype actualSize = docs.size();
     if (actualSize < 1)
@@ -218,7 +218,7 @@ bool recursiveOperation(const QDir &path, const std::function<bool (const QStrin
     return recursiveOperation(path.absolutePath(), operation);
 }
 
-QVector<QObject *> loadPlugins_helper(const char *type, const QStringList &files, const char *iid) Q_DECL_NOEXCEPT_EXPR(false)
+QVector<QObject *> loadPlugins_helper(const char *type, const QStringList &files, const char *iid) noexcept(false)
 {
     QVector<QObject *> interfaces;
     interfaces.reserve(files.size());
@@ -283,7 +283,7 @@ QString translateFromMap(const QMap<QString, QString> &languageToName, const QSt
     }
 }
 
-void loadResource(const QString &resource) Q_DECL_NOEXCEPT_EXPR(false)
+void loadResource(const QString &resource) noexcept(false)
 {
     QString afp = QDir().absoluteFilePath(resource);
     QStringList errors;
@@ -321,7 +321,7 @@ void closeAndClearFileDescriptors(QVector<int> &fdList)
     fdList.clear();
 }
 
-void validateIdForFilesystemUsage(const QString &id)  Q_DECL_NOEXCEPT_EXPR(false)
+void validateIdForFilesystemUsage(const QString &id)  noexcept(false)
 {
     // we need to make sure that we can use the name as directory in a filesystem and inode names
     // are limited to 255 characters in Linux. We need to subtract a safety margin for prefixes
diff --git a/src/common-lib/utilities.h b/src/common-lib/utilities.h
index b42f222a..2201a6e3 100644
--- a/src/common-lib/utilities.h
+++ b/src/common-lib/utilities.h
@@ -29,7 +29,7 @@ int timeoutFactor();
 using YamlFormat = QPair<QString, int>;
 
 YamlFormat checkYamlFormat(const QVector<QVariant> &docs, int numberOfDocuments,
-                           const QVector<YamlFormat> &formatTypesAndVersions) Q_DECL_NOEXCEPT_EXPR(false);
+                           const QVector<YamlFormat> &formatTypesAndVersions) noexcept(false);
 
 /*! \internal
     Convenience function that makes it easy to accept a plain string where
@@ -100,10 +100,10 @@ bool safeRemove(const QString &path, RecursiveOperationType type);
 
 qint64 getParentPid(qint64 pid);
 
-QVector<QObject *> loadPlugins_helper(const char *type, const QStringList &files, const char *iid) Q_DECL_NOEXCEPT_EXPR(false);
+QVector<QObject *> loadPlugins_helper(const char *type, const QStringList &files, const char *iid) noexcept(false);
 
 template <typename T>
-QVector<T *> loadPlugins(const char *type, const QStringList &files) Q_DECL_NOEXCEPT_EXPR(false)
+QVector<T *> loadPlugins(const char *type, const QStringList &files) noexcept(false)
 {
     QVector<T *> result;
     auto plugins = loadPlugins_helper(type, files, qobject_interface_iid<T *>());
@@ -113,7 +113,7 @@ QVector<T *> loadPlugins(const char *type, const QStringList &files) Q_DECL_NOEX
 }
 
 // Load a Qt resource, either in the form of a resource file or a plugin
-void loadResource(const QString &resource) Q_DECL_NOEXCEPT_EXPR(false);
+void loadResource(const QString &resource) noexcept(false);
 
 // Qt6 removed v_cast, but the "replacement" QVariant::Private::get is const only
 template <typename T> T *qt6_v_cast(QVariant::Private *vp)
@@ -125,7 +125,7 @@ template <typename T> T *qt6_v_cast(QVariant::Private *vp)
 void closeAndClearFileDescriptors(QVector<int> &fdList);
 
 // make sure that the given id can be used as a filename
-void validateIdForFilesystemUsage(const QString &id) Q_DECL_NOEXCEPT_EXPR(false);
+void validateIdForFilesystemUsage(const QString &id) noexcept(false);
 
 QJSEngine *getJSEngine(const QObject *obj);
 
diff --git a/src/crypto-lib/signature_macos.cpp b/src/crypto-lib/signature_macos.cpp
index 60094a2d..61f584f5 100644
--- a/src/crypto-lib/signature_macos.cpp
+++ b/src/crypto-lib/signature_macos.cpp
@@ -33,7 +33,7 @@ public:
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 
 QByteArray SignaturePrivate::create(const QByteArray &signingCertificatePkcs12,
-                                    const QByteArray &signingCertificatePassword) Q_DECL_NOEXCEPT_EXPR(false)
+                                    const QByteArray &signingCertificatePassword) noexcept(false)
 {
     QCFType<SecKeychainRef> localKeyChain;
 
@@ -101,7 +101,7 @@ QByteArray SignaturePrivate::create(const QByteArray &signingCertificatePkcs12,
 }
 
 bool SignaturePrivate::verify(const QByteArray &signaturePkcs7,
-                              const QList<QByteArray> &chainOfTrust) Q_DECL_NOEXCEPT_EXPR(false)
+                              const QByteArrayList &chainOfTrust) noexcept(false)
 {
     OSStatus err;
 
diff --git a/src/crypto-lib/signature_openssl.cpp b/src/crypto-lib/signature_openssl.cpp
index caef4de7..b94e83ad 100644
--- a/src/crypto-lib/signature_openssl.cpp
+++ b/src/crypto-lib/signature_openssl.cpp
@@ -95,7 +95,7 @@ public:
 
 
 QByteArray SignaturePrivate::create(const QByteArray &signingCertificatePkcs12,
-                                    const QByteArray &signingCertificatePassword) Q_DECL_NOEXCEPT_EXPR(false)
+                                    const QByteArray &signingCertificatePassword) noexcept(false)
 {
     OpenSslPointer<BIO> bioPkcs12(am_BIO_new_mem_buf(signingCertificatePkcs12.constData(), signingCertificatePkcs12.size()));
     if (!bioPkcs12)
@@ -152,7 +152,7 @@ QByteArray SignaturePrivate::create(const QByteArray &signingCertificatePkcs12,
 }
 
 bool SignaturePrivate::verify(const QByteArray &signaturePkcs7,
-                              const QList<QByteArray> &chainOfTrust) Q_DECL_NOEXCEPT_EXPR(false)
+                              const QByteArrayList &chainOfTrust) noexcept(false)
 {
     OpenSslPointer<BIO> bioSignature(am_BIO_new_mem_buf(signaturePkcs7.constData(), signaturePkcs7.size()));
     if (!bioSignature)
diff --git a/src/crypto-lib/signature_p.h b/src/crypto-lib/signature_p.h
index 572c9aba..aa09aa05 100644
--- a/src/crypto-lib/signature_p.h
+++ b/src/crypto-lib/signature_p.h
@@ -16,9 +16,9 @@ public:
     QString error;
 
     QByteArray create(const QByteArray &signingCertificatePkcs12,
-                      const QByteArray &signingCertificatePassword) Q_DECL_NOEXCEPT_EXPR(false);
+                      const QByteArray &signingCertificatePassword) noexcept(false);
     bool verify(const QByteArray &signaturePkcs7,
-                const QList<QByteArray> &chainOfTrust) Q_DECL_NOEXCEPT_EXPR(false);
+                const QByteArrayList &chainOfTrust) noexcept(false);
 };
 
 QT_END_NAMESPACE_AM
diff --git a/src/crypto-lib/signature_win.cpp b/src/crypto-lib/signature_win.cpp
index 73fb6d88..338e01ab 100644
--- a/src/crypto-lib/signature_win.cpp
+++ b/src/crypto-lib/signature_win.cpp
@@ -31,7 +31,7 @@ public:
 };
 
 QByteArray SignaturePrivate::create(const QByteArray &signingCertificatePkcs12,
-                                    const QByteArray &signingCertificatePassword) Q_DECL_NOEXCEPT_EXPR(false)
+                                    const QByteArray &signingCertificatePassword) noexcept(false)
 {
     HCERTSTORE certStore = nullptr;
 
@@ -106,7 +106,7 @@ QByteArray SignaturePrivate::create(const QByteArray &signingCertificatePkcs12,
 }
 
 bool SignaturePrivate::verify(const QByteArray &signaturePkcs7,
-                              const QList<QByteArray> &chainOfTrust) Q_DECL_NOEXCEPT_EXPR(false)
+                              const QByteArrayList &chainOfTrust) noexcept(false)
 {
     PCCERT_CONTEXT signerCert = nullptr;
     HCERTSTORE msgCertStore = nullptr;
diff --git a/src/dbus-lib/dbusdaemon.cpp b/src/dbus-lib/dbusdaemon.cpp
index 25f8750e..01690890 100644
--- a/src/dbus-lib/dbusdaemon.cpp
+++ b/src/dbus-lib/dbusdaemon.cpp
@@ -86,7 +86,7 @@ DBusDaemonProcess::~DBusDaemonProcess()
     waitForFinished();
 }
 
-void DBusDaemonProcess::start() Q_DECL_NOEXCEPT_EXPR(false)
+void DBusDaemonProcess::start() noexcept(false)
 {
     static const int timeout = 10000 * int(timeoutFactor());
 
diff --git a/src/dbus-lib/dbusdaemon.h b/src/dbus-lib/dbusdaemon.h
index 49b0913e..9dea4941 100644
--- a/src/dbus-lib/dbusdaemon.h
+++ b/src/dbus-lib/dbusdaemon.h
@@ -16,7 +16,7 @@ public:
     DBusDaemonProcess(QObject *parent = nullptr);
     ~DBusDaemonProcess() override;
 
-    static void start() Q_DECL_NOEXCEPT_EXPR(false);
+    static void start() noexcept(false);
 };
 
 QT_END_NAMESPACE_AM
diff --git a/src/intent-client-lib/intentclientsysteminterface.h b/src/intent-client-lib/intentclientsysteminterface.h
index 6712bfea..336d66fb 100644
--- a/src/intent-client-lib/intentclientsysteminterface.h
+++ b/src/intent-client-lib/intentclientsysteminterface.h
@@ -25,7 +25,7 @@ public:
     IntentClientSystemInterface(QObject *parent = nullptr);
     virtual ~IntentClientSystemInterface() = default;
 
-    virtual void initialize(IntentClient *intentClient) Q_DECL_NOEXCEPT_EXPR(false);
+    virtual void initialize(IntentClient *intentClient) noexcept(false);
 
     virtual QString currentApplicationId(QObject *hint) = 0;
 
diff --git a/src/main-lib/main.cpp b/src/main-lib/main.cpp
index 695eaaef..ae070e7a 100644
--- a/src/main-lib/main.cpp
+++ b/src/main-lib/main.cpp
@@ -110,7 +110,7 @@ QT_BEGIN_NAMESPACE_AM
 
 static void registerDBusObject(QDBusAbstractAdaptor *adaptor, QString dbusName, const char *serviceName,
                                const char *interfaceName, const char *path,
-                               const QString &instanceId) Q_DECL_NOEXCEPT_EXPR(false)
+                               const QString &instanceId) noexcept(false)
 {
     QString dbusAddress;
     QDBusConnection conn((QString()));
@@ -252,7 +252,7 @@ Main::~Main()
     The caller has to make sure that cfg will be available even after this function returns:
     we will access the cfg object from delayed init functions via lambdas!
 */
-void Main::setup(const Configuration *cfg) Q_DECL_NOEXCEPT_EXPR(false)
+void Main::setup(const Configuration *cfg) noexcept(false)
 {
     StartupTimer::instance()->checkpoint("after configuration parsing");
 
@@ -400,7 +400,7 @@ void Main::registerResources(const QStringList &resources) const
     StartupTimer::instance()->checkpoint("after resource registration");
 }
 
-void Main::loadStartupPlugins(const QStringList &startupPluginPaths) Q_DECL_NOEXCEPT_EXPR(false)
+void Main::loadStartupPlugins(const QStringList &startupPluginPaths) noexcept(false)
 {
     QStringList systemStartupPluginPaths;
     const QDir systemStartupPluginDir(QLibraryInfo::path(QLibraryInfo::PluginsPath) + QDir::separator() + u"appman_startup"_s);
@@ -436,7 +436,7 @@ void Main::parseSystemProperties(const QVariantMap &rawSystemProperties)
         iface->initialize(m_systemProperties.at(SP_SystemUi));
 }
 
-void Main::setMainQmlFile(const QString &mainQml) Q_DECL_NOEXCEPT_EXPR(false)
+void Main::setMainQmlFile(const QString &mainQml) noexcept(false)
 {
     // For some weird reason, QFile cannot cope with "qrc:/" and QUrl cannot cope with ":/",
     // so we have to translate ourselves between those two "worlds".
@@ -454,7 +454,7 @@ void Main::setMainQmlFile(const QString &mainQml) Q_DECL_NOEXCEPT_EXPR(false)
     }
 }
 
-void Main::setupSingleOrMultiProcess(bool forceSingleProcess, bool forceMultiProcess) Q_DECL_NOEXCEPT_EXPR(false)
+void Main::setupSingleOrMultiProcess(bool forceSingleProcess, bool forceMultiProcess) noexcept(false)
 {
     m_isSingleProcessMode = forceSingleProcess;
     if (forceMultiProcess && m_isSingleProcessMode)
@@ -528,7 +528,7 @@ void Main::setupRuntimesAndContainers(const QVariantMap &runtimeConfigurations,
     StartupTimer::instance()->checkpoint("after runtime registration");
 }
 
-void Main::loadPackageDatabase(bool recreateDatabase, const QString &singlePackage) Q_DECL_NOEXCEPT_EXPR(false)
+void Main::loadPackageDatabase(bool recreateDatabase, const QString &singlePackage) noexcept(false)
 {
     if (!singlePackage.isEmpty()) {
         m_packageDatabase = new PackageDatabase(singlePackage);
@@ -559,7 +559,7 @@ void Main::loadPackageDatabase(bool recreateDatabase, const QString &singlePacka
 }
 
 void Main::setupIntents(int disambiguationTimeout, int startApplicationTimeout,
-                        int replyFromApplicationTimeout, int replyFromSystemTimeout) Q_DECL_NOEXCEPT_EXPR(false)
+                        int replyFromApplicationTimeout, int replyFromSystemTimeout) noexcept(false)
 {
     m_intentServer = IntentAMImplementation::createIntentServerAndClientInstance(m_packageManager,
                                                                                  disambiguationTimeout,
@@ -569,7 +569,7 @@ void Main::setupIntents(int disambiguationTimeout, int startApplicationTimeout,
     StartupTimer::instance()->checkpoint("after IntentServer instantiation");
 }
 
-void Main::setupSingletons(const QList<QPair<QString, QString>> &containerSelectionConfiguration) Q_DECL_NOEXCEPT_EXPR(false)
+void Main::setupSingletons(const QList<QPair<QString, QString>> &containerSelectionConfiguration) noexcept(false)
 {
     m_packageManager = PackageManager::createInstance(m_packageDatabase, m_documentDir);
     m_applicationManager = ApplicationManager::createInstance(m_isSingleProcessMode);
@@ -590,7 +590,7 @@ void Main::setupSingletons(const QList<QPair<QString, QString>> &containerSelect
 
 void Main::setupQuickLauncher(const QHash<std::pair<QString, QString>, int> &runtimesPerContainer,
                               qreal idleLoad, int failedStartLimit,
-                              int failedStartLimitIntervalSec) Q_DECL_NOEXCEPT_EXPR(false)
+                              int failedStartLimitIntervalSec) noexcept(false)
 {
     if (!runtimesPerContainer.isEmpty()) {
         m_quickLauncher = QuickLauncher::createInstance(runtimesPerContainer, idleLoad,
@@ -601,7 +601,7 @@ void Main::setupQuickLauncher(const QHash<std::pair<QString, QString>, int> &run
     }
 }
 
-void Main::setupInstaller(bool allowUnsigned, const QStringList &caCertificatePaths) Q_DECL_NOEXCEPT_EXPR(false)
+void Main::setupInstaller(bool allowUnsigned, const QStringList &caCertificatePaths) noexcept(false)
 {
 #if QT_CONFIG(am_installer)
     // make sure the installation and document dirs are valid
@@ -800,7 +800,7 @@ void Main::setupWindowManager(const QString &waylandSocketName, const QVariantLi
                      m_windowManager, &WindowManager::raiseApplicationWindow);
 }
 
-void Main::loadQml(bool loadDummyData) Q_DECL_NOEXCEPT_EXPR(false)
+void Main::loadQml(bool loadDummyData) noexcept(false)
 {
     for (auto iface : std::as_const(m_startupPlugins))
         iface->beforeQmlEngineLoad(m_engine);
diff --git a/src/main-lib/main.h b/src/main-lib/main.h
index 88cd5ed4..cbb93b07 100644
--- a/src/main-lib/main.h
+++ b/src/main-lib/main.h
@@ -67,8 +67,8 @@ public:
     bool isSingleProcessMode() const;
     bool isRunningOnEmbedded() const;
 
-    void setup(const Configuration *cfg) Q_DECL_NOEXCEPT_EXPR(false);
-    void loadQml(bool loadDummyData) Q_DECL_NOEXCEPT_EXPR(false);
+    void setup(const Configuration *cfg) noexcept(false);
+    void loadQml(bool loadDummyData) noexcept(false);
     void showWindow(bool showFullscreen);
 
     Q_INVOKABLE void shutDown(int exitCode = 0);
@@ -79,23 +79,23 @@ public:
 
 protected:
     void registerResources(const QStringList &resources) const;
-    void loadStartupPlugins(const QStringList &startupPluginPaths) Q_DECL_NOEXCEPT_EXPR(false);
+    void loadStartupPlugins(const QStringList &startupPluginPaths) noexcept(false);
     void parseSystemProperties(const QVariantMap &rawSystemProperties);
     void setupDBus(const std::function<QString(const char *)> &busForInterface,
                    const std::function<QVariantMap(const char *)> &policyForInterface, const QString &instanceId);
-    void setMainQmlFile(const QString &mainQml) Q_DECL_NOEXCEPT_EXPR(false);
-    void setupSingleOrMultiProcess(bool forceSingleProcess, bool forceMultiProcess) Q_DECL_NOEXCEPT_EXPR(false);
+    void setMainQmlFile(const QString &mainQml) noexcept(false);
+    void setupSingleOrMultiProcess(bool forceSingleProcess, bool forceMultiProcess) noexcept(false);
     void setupRuntimesAndContainers(const QVariantMap &runtimeConfigurations, const QStringList &runtimeAdditionalLaunchers,
                                     const QVariantMap &containerConfigurations, const QStringList &containerPluginPaths,
                                     const QVariantMap &openGLConfiguration,
                                     const QStringList &iconThemeSearchPaths, const QString &iconThemeName);
-    void loadPackageDatabase(bool recreateDatabase, const QString &singlePackage) Q_DECL_NOEXCEPT_EXPR(false);
+    void loadPackageDatabase(bool recreateDatabase, const QString &singlePackage) noexcept(false);
     void setupIntents(int disambiguationTimeout, int startApplicationTimeout,
-                      int replyFromApplicationTimeout, int replyFromSystemTimeout) Q_DECL_NOEXCEPT_EXPR(false);
-    void setupSingletons(const QList<QPair<QString, QString>> &containerSelectionConfiguration) Q_DECL_NOEXCEPT_EXPR(false);
+                      int replyFromApplicationTimeout, int replyFromSystemTimeout) noexcept(false);
+    void setupSingletons(const QList<QPair<QString, QString>> &containerSelectionConfiguration) noexcept(false);
     void setupQuickLauncher(const QHash<std::pair<QString, QString>, int> &runtimesPerContainer,
-                            qreal idleLoad, int failedStartLimit, int failedStartLimitIntervalSec) Q_DECL_NOEXCEPT_EXPR(false);
-    void setupInstaller(bool allowUnsigned, const QStringList &caCertificatePaths) Q_DECL_NOEXCEPT_EXPR(false);
+                            qreal idleLoad, int failedStartLimit, int failedStartLimitIntervalSec) noexcept(false);
+    void setupInstaller(bool allowUnsigned, const QStringList &caCertificatePaths) noexcept(false);
     void registerPackages();
 
     void setupQmlEngine(const QStringList &importPaths, const QString &quickControlsStyle = QString());
diff --git a/src/manager-lib/applicationmanager.cpp b/src/manager-lib/applicationmanager.cpp
index 8773f6d6..4296be5d 100644
--- a/src/manager-lib/applicationmanager.cpp
+++ b/src/manager-lib/applicationmanager.cpp
@@ -595,7 +595,7 @@ void ApplicationManager::registerMimeTypes()
 bool ApplicationManager::startApplicationInternal(const QString &appId, const QString &documentUrl,
                                                   const QString &documentMimeType,
                                                   const QString &debugWrapperSpecification,
-                                                  QVector<int> &&stdioRedirections)  Q_DECL_NOEXCEPT_EXPR(false)
+                                                  QVector<int> &&stdioRedirections)  noexcept(false)
 {
     auto redirectionGuard = qScopeGuard([&stdioRedirections]() {
         closeAndClearFileDescriptors(stdioRedirections);
diff --git a/src/manager-lib/applicationmanager.h b/src/manager-lib/applicationmanager.h
index cb83d6a4..6d5a38e0 100644
--- a/src/manager-lib/applicationmanager.h
+++ b/src/manager-lib/applicationmanager.h
@@ -74,7 +74,7 @@ public:
     bool startApplicationInternal(const QString &appId, const QString &documentUrl = QString(),
                                   const QString &documentMimeType = QString(),
                                   const QString &debugWrapperSpecification = QString(),
-                                  QVector<int> &&stdioRedirections = QVector<int>()) Q_DECL_NOEXCEPT_EXPR(false);
+                                  QVector<int> &&stdioRedirections = QVector<int>()) noexcept(false);
     void stopApplicationInternal(Application *app, bool forceKill = false);
 
     // only use these two functions for development!
diff --git a/src/manager-lib/installationtask.cpp b/src/manager-lib/installationtask.cpp
index 92e3c50f..e5fd93b3 100644
--- a/src/manager-lib/installationtask.cpp
+++ b/src/manager-lib/installationtask.cpp
@@ -250,7 +250,7 @@ void InstallationTask::execute()
 }
 
 
-void InstallationTask::checkExtractedFile(const QString &file) Q_DECL_NOEXCEPT_EXPR(false)
+void InstallationTask::checkExtractedFile(const QString &file) noexcept(false)
 {
     ++m_extractedFileCount;
 
@@ -360,7 +360,7 @@ void InstallationTask::checkExtractedFile(const QString &file) Q_DECL_NOEXCEPT_E
     }
 }
 
-void InstallationTask::startInstallation() Q_DECL_NOEXCEPT_EXPR(false)
+void InstallationTask::startInstallation() noexcept(false)
 {
     // 2. delete old, partial installation
 
@@ -380,7 +380,7 @@ void InstallationTask::startInstallation() Q_DECL_NOEXCEPT_EXPR(false)
     m_applicationDir.setPath(installationDir.absoluteFilePath(m_packageId));
 }
 
-void InstallationTask::finishInstallation() Q_DECL_NOEXCEPT_EXPR(false)
+void InstallationTask::finishInstallation() noexcept(false)
 {
     QDir documentDirectory(m_documentPath);
     ScopedDirectoryCreator documentDirCreator;
diff --git a/src/manager-lib/installationtask.h b/src/manager-lib/installationtask.h
index 0a2f24c3..4f7fb341 100644
--- a/src/manager-lib/installationtask.h
+++ b/src/manager-lib/installationtask.h
@@ -43,9 +43,9 @@ protected:
     void execute() override;
 
 private:
-    void startInstallation() Q_DECL_NOEXCEPT_EXPR(false);
-    void finishInstallation() Q_DECL_NOEXCEPT_EXPR(false);
-    void checkExtractedFile(const QString &file) Q_DECL_NOEXCEPT_EXPR(false);
+    void startInstallation() noexcept(false);
+    void finishInstallation() noexcept(false);
+    void checkExtractedFile(const QString &file) noexcept(false);
 
 private:
     PackageManager *m_pm;
diff --git a/src/manager-lib/intentaminterface.cpp b/src/manager-lib/intentaminterface.cpp
index cb9e2ca3..a129147a 100644
--- a/src/manager-lib/intentaminterface.cpp
+++ b/src/manager-lib/intentaminterface.cpp
@@ -252,7 +252,7 @@ QString IntentClientAMImplementation::currentApplicationId(QObject *hint)
     return runtime ? runtime->application()->info()->id() : IntentClient::instance()->systemUiId();
 }
 
-void IntentClientAMImplementation::initialize(IntentClient *intentClient) Q_DECL_NOEXCEPT_EXPR(false)
+void IntentClientAMImplementation::initialize(IntentClient *intentClient) noexcept(false)
 {
     IntentClientSystemInterface::initialize(intentClient);
 }
diff --git a/src/manager-lib/intentaminterface.h b/src/manager-lib/intentaminterface.h
index 78b7be0f..c5e60398 100644
--- a/src/manager-lib/intentaminterface.h
+++ b/src/manager-lib/intentaminterface.h
@@ -67,7 +67,7 @@ class IntentClientAMImplementation : public IntentClientSystemInterface
 public:
     IntentClientAMImplementation(IntentServerAMImplementation *serverInterface);
 
-    void initialize(IntentClient *intentClient) Q_DECL_NOEXCEPT_EXPR(false) override;
+    void initialize(IntentClient *intentClient) noexcept(false) override;
     QString currentApplicationId(QObject *hint) override;
 
     void requestToSystem(QPointer<IntentClientRequest> icr) override;
diff --git a/src/manager-lib/packagemanager.cpp b/src/manager-lib/packagemanager.cpp
index a816ea60..b601e3d4 100644
--- a/src/manager-lib/packagemanager.cpp
+++ b/src/manager-lib/packagemanager.cpp
@@ -838,7 +838,7 @@ bool PackageManager::isPackageInstallationActive(const QString &packageId) const
     return false;
 }
 
-void PackageManager::cleanupBrokenInstallations() Q_DECL_NOEXCEPT_EXPR(false)
+void PackageManager::cleanupBrokenInstallations() noexcept(false)
 {
     if (d->cleanupBrokenInstallationsDone)
         return;
diff --git a/src/manager-lib/packagemanager.h b/src/manager-lib/packagemanager.h
index 2eefdf1b..e97fdaea 100644
--- a/src/manager-lib/packagemanager.h
+++ b/src/manager-lib/packagemanager.h
@@ -102,7 +102,7 @@ public:
     QString architecture() const;
     void setCACertificates(const QList<QByteArray> &chainOfTrust);
 
-    void cleanupBrokenInstallations() Q_DECL_NOEXCEPT_EXPR(false);
+    void cleanupBrokenInstallations() noexcept(false);
 
     QVariantMap installationLocation() const;
     QVariantMap documentLocation() const;
diff --git a/src/manager-lib/sudo.h b/src/manager-lib/sudo.h
index 7252bf18..f8cb502d 100644
--- a/src/manager-lib/sudo.h
+++ b/src/manager-lib/sudo.h
@@ -30,7 +30,7 @@ public:
         DropPrivilegesRegainable, // only use this for auto-tests
     };
 
-    static void forkServer(DropPrivileges dropPrivileges) Q_DECL_NOEXCEPT_EXPR(false);
+    static void forkServer(DropPrivileges dropPrivileges) noexcept(false);
 };
 
 class SudoInterface
diff --git a/src/package-lib/packageextractor.cpp b/src/package-lib/packageextractor.cpp
index 6a1c23d0..6c97daaa 100644
--- a/src/package-lib/packageextractor.cpp
+++ b/src/package-lib/packageextractor.cpp
@@ -417,7 +417,7 @@ void PackageExtractorPrivate::extract()
 }
 
 void PackageExtractorPrivate::processMetaData(const QByteArray &metadata, QCryptographicHash &digest,
-                                              bool isHeader) Q_DECL_NOEXCEPT_EXPR(false)
+                                              bool isHeader) noexcept(false)
 {
     QVector<QVariant> docs;
     try {
diff --git a/src/package-lib/packageextractor_p.h b/src/package-lib/packageextractor_p.h
index e29f63cf..d5c48548 100644
--- a/src/package-lib/packageextractor_p.h
+++ b/src/package-lib/packageextractor_p.h
@@ -38,7 +38,7 @@ private slots:
 private:
     void setError(Error errorCode, const QString &errorString);
     qint64 readTar(struct archive *ar, const void **archiveBuffer);
-    void processMetaData(const QByteArray &metadata, QCryptographicHash &digest, bool isHeader) Q_DECL_NOEXCEPT_EXPR(false);
+    void processMetaData(const QByteArray &metadata, QCryptographicHash &digest, bool isHeader) noexcept(false);
 
 private:
     PackageExtractor *q;
diff --git a/src/package-lib/packageutilities.cpp b/src/package-lib/packageutilities.cpp
index 5c228168..480b991c 100644
--- a/src/package-lib/packageutilities.cpp
+++ b/src/package-lib/packageutilities.cpp
@@ -44,7 +44,7 @@ void PackageUtilities::addFileMetadataToDigest(const QString &entryFilePath, con
     digest.addData(addToDigest);
 }
 
-void PackageUtilities::addHeaderDataToDigest(const QVariantMap &header, QCryptographicHash &digest) Q_DECL_NOEXCEPT_EXPR(false)
+void PackageUtilities::addHeaderDataToDigest(const QVariantMap &header, QCryptographicHash &digest) noexcept(false)
 {
     for (auto it = headerDataForDigest.constBegin(); it != headerDataForDigest.constEnd(); ++it) {
         if (header.contains(it.key())) {
diff --git a/src/package-lib/packageutilities_p.h b/src/package-lib/packageutilities_p.h
index c4692c2a..e8a02fb9 100644
--- a/src/package-lib/packageutilities_p.h
+++ b/src/package-lib/packageutilities_p.h
@@ -18,7 +18,7 @@ QT_BEGIN_NAMESPACE_AM
 namespace PackageUtilities
 {
 void addFileMetadataToDigest(const QString &entryFilePath, const QFileInfo &fi, QCryptographicHash &digest);
-void addHeaderDataToDigest(const QVariantMap &header, QCryptographicHash &digest) Q_DECL_NOEXCEPT_EXPR(false);
+void addHeaderDataToDigest(const QVariantMap &header, QCryptographicHash &digest) noexcept(false);
 
 // key == field name, value == type to choose correct hashing algorithm
 extern QVariantMap headerDataForDigest;
diff --git a/src/plugin-interfaces/startupinterface.h b/src/plugin-interfaces/startupinterface.h
index b792a39a..bcd872d4 100644
--- a/src/plugin-interfaces/startupinterface.h
+++ b/src/plugin-interfaces/startupinterface.h
@@ -18,14 +18,14 @@ class StartupInterface
 public:
     virtual ~StartupInterface();
 
-    virtual void initialize(const QVariantMap &systemProperties) Q_DECL_NOEXCEPT_EXPR(false) = 0;
+    virtual void initialize(const QVariantMap &systemProperties) noexcept(false) = 0;
 
-    virtual void afterRuntimeRegistration() Q_DECL_NOEXCEPT_EXPR(false) = 0;
-    virtual void beforeQmlEngineLoad(QQmlEngine *engine) Q_DECL_NOEXCEPT_EXPR(false) = 0;
-    virtual void afterQmlEngineLoad(QQmlEngine *engine) Q_DECL_NOEXCEPT_EXPR(false) = 0;
+    virtual void afterRuntimeRegistration() noexcept(false) = 0;
+    virtual void beforeQmlEngineLoad(QQmlEngine *engine) noexcept(false) = 0;
+    virtual void afterQmlEngineLoad(QQmlEngine *engine) noexcept(false) = 0;
 
-    virtual void beforeWindowShow(QWindow *window) Q_DECL_NOEXCEPT_EXPR(false) = 0;
-    virtual void afterWindowShow(QWindow *window) Q_DECL_NOEXCEPT_EXPR(false) = 0;
+    virtual void beforeWindowShow(QWindow *window) noexcept(false) = 0;
+    virtual void afterWindowShow(QWindow *window) noexcept(false) = 0;
 };
 
 #define AM_StartupInterface_iid "io.qt.ApplicationManager.StartupInterface"
diff --git a/src/tools/controller/controller.cpp b/src/tools/controller/controller.cpp
index 8daa0596..fc42807b 100644
--- a/src/tools/controller/controller.cpp
+++ b/src/tools/controller/controller.cpp
@@ -52,7 +52,7 @@ public:
             m_instanceId.append(u'-');
     }
 
-    void connectToManager() Q_DECL_NOEXCEPT_EXPR(false)
+    void connectToManager() noexcept(false)
     {
         if (m_manager)
             return;
@@ -61,7 +61,7 @@ public:
         m_manager = new IoQtApplicationManagerInterface(u"io.qt.ApplicationManager"_s, u"/ApplicationManager"_s, conn, this);
     }
 
-    void connectToPackager() Q_DECL_NOEXCEPT_EXPR(false)
+    void connectToPackager() noexcept(false)
     {
         if (m_packager)
             return;
@@ -74,7 +74,7 @@ signals:
     void disconnected(QString reason);
 
 private:
-    QDBusConnection connectTo(const QString &iface) Q_DECL_NOEXCEPT_EXPR(false)
+    QDBusConnection connectTo(const QString &iface) noexcept(false)
     {
         QDBusConnection conn(iface);
 
@@ -233,23 +233,23 @@ static Command command(QCommandLineParser &clp)
 
 static void startOrDebugApplication(const QString &debugWrapper, const QString &appId,
                                     const QMap<QString, int> &stdRedirections, bool restart,
-                                    const QString &documentUrl) Q_DECL_NOEXCEPT_EXPR(false);
-static void stopApplication(const QString &appId, bool forceKill = false) Q_DECL_NOEXCEPT_EXPR(false);
-static void stopAllApplications() Q_DECL_NOEXCEPT_EXPR(false);
-static void listApplications() Q_DECL_NOEXCEPT_EXPR(false);
-static void showApplication(const QString &appId, bool asJson = false) Q_DECL_NOEXCEPT_EXPR(false);
-static void listPackages() Q_DECL_NOEXCEPT_EXPR(false);
-static void showPackage(const QString &packageId, bool asJson = false) Q_DECL_NOEXCEPT_EXPR(false);
-static void installPackage(const QString &packageUrl, bool acknowledge) Q_DECL_NOEXCEPT_EXPR(false);
-static void removePackage(const QString &packageId, bool keepDocuments, bool force) Q_DECL_NOEXCEPT_EXPR(false);
-static void listInstallationTasks() Q_DECL_NOEXCEPT_EXPR(false);
-static void cancelInstallationTask(bool all, const QString &singleTaskId) Q_DECL_NOEXCEPT_EXPR(false);
-static void listInstallationLocations() Q_DECL_NOEXCEPT_EXPR(false);
-static void showInstallationLocation(bool asJson = false) Q_DECL_NOEXCEPT_EXPR(false);
-static void listInstances() Q_DECL_NOEXCEPT_EXPR(false);
+                                    const QString &documentUrl) noexcept(false);
+static void stopApplication(const QString &appId, bool forceKill = false) noexcept(false);
+static void stopAllApplications() noexcept(false);
+static void listApplications() noexcept(false);
+static void showApplication(const QString &appId, bool asJson = false) noexcept(false);
+static void listPackages() noexcept(false);
+static void showPackage(const QString &packageId, bool asJson = false) noexcept(false);
+static void installPackage(const QString &packageUrl, bool acknowledge) noexcept(false);
+static void removePackage(const QString &packageId, bool keepDocuments, bool force) noexcept(false);
+static void listInstallationTasks() noexcept(false);
+static void cancelInstallationTask(bool all, const QString &singleTaskId) noexcept(false);
+static void listInstallationLocations() noexcept(false);
+static void showInstallationLocation(bool asJson = false) noexcept(false);
+static void listInstances() noexcept(false);
 static void injectIntentRequest(const QString &intentId, bool isBroadcast,
                                 const QString &applicationId, const QString &requestingApplicationId,
-                                const QString &jsonParameters) Q_DECL_NOEXCEPT_EXPR(false);
+                                const QString &jsonParameters) noexcept(false);
 
 
 class ThrowingApplication : public QCoreApplication // clazy:exclude=missing-qobject-macro
@@ -574,7 +574,7 @@ int main(int argc, char *argv[])
 
 void startOrDebugApplication(const QString &debugWrapper, const QString &appId,
                              const QMap<QString, int> &stdRedirections, bool restart,
-                             const QString &documentUrl = QString()) Q_DECL_NOEXCEPT_EXPR(false)
+                             const QString &documentUrl = QString()) noexcept(false)
 {
     dbus.connectToManager();
 
@@ -662,7 +662,7 @@ void startOrDebugApplication(const QString &debugWrapper, const QString &appId,
     }
 }
 
-void stopApplication(const QString &appId, bool forceKill) Q_DECL_NOEXCEPT_EXPR(false)
+void stopApplication(const QString &appId, bool forceKill) noexcept(false)
 {
     dbus.connectToManager();
 
@@ -673,7 +673,7 @@ void stopApplication(const QString &appId, bool forceKill) Q_DECL_NOEXCEPT_EXPR(
     qApp->quit();
 }
 
-void stopAllApplications() Q_DECL_NOEXCEPT_EXPR(false)
+void stopAllApplications() noexcept(false)
 {
     dbus.connectToManager();
 
@@ -684,7 +684,7 @@ void stopAllApplications() Q_DECL_NOEXCEPT_EXPR(false)
     qApp->quit();
 }
 
-void listApplications() Q_DECL_NOEXCEPT_EXPR(false)
+void listApplications() noexcept(false)
 {
     dbus.connectToManager();
 
@@ -699,7 +699,7 @@ void listApplications() Q_DECL_NOEXCEPT_EXPR(false)
     qApp->quit();
 }
 
-void showApplication(const QString &appId, bool asJson) Q_DECL_NOEXCEPT_EXPR(false)
+void showApplication(const QString &appId, bool asJson) noexcept(false)
 {
     dbus.connectToManager();
 
@@ -714,7 +714,7 @@ void showApplication(const QString &appId, bool asJson) Q_DECL_NOEXCEPT_EXPR(fal
     qApp->quit();
 }
 
-void listPackages() Q_DECL_NOEXCEPT_EXPR(false)
+void listPackages() noexcept(false)
 {
     dbus.connectToPackager();
 
@@ -729,7 +729,7 @@ void listPackages() Q_DECL_NOEXCEPT_EXPR(false)
     qApp->quit();
 }
 
-void showPackage(const QString &packageId, bool asJson) Q_DECL_NOEXCEPT_EXPR(false)
+void showPackage(const QString &packageId, bool asJson) noexcept(false)
 {
     dbus.connectToPackager();
 
@@ -744,7 +744,7 @@ void showPackage(const QString &packageId, bool asJson) Q_DECL_NOEXCEPT_EXPR(fal
     qApp->quit();
 }
 
-void installPackage(const QString &package, bool acknowledge) Q_DECL_NOEXCEPT_EXPR(false)
+void installPackage(const QString &package, bool acknowledge) noexcept(false)
 {
     QString packageFile = package;
 
@@ -838,7 +838,7 @@ void installPackage(const QString &package, bool acknowledge) Q_DECL_NOEXCEPT_EX
     });
 }
 
-void removePackage(const QString &packageId, bool keepDocuments, bool force) Q_DECL_NOEXCEPT_EXPR(false)
+void removePackage(const QString &packageId, bool keepDocuments, bool force) noexcept(false)
 {
     fprintf(stdout, "Starting removal of package %s...\n", qPrintable(packageId));
 
@@ -882,7 +882,7 @@ void removePackage(const QString &packageId, bool keepDocuments, bool force) Q_D
         throw Exception(Error::IO, "removePackage returned an empty taskId");
 }
 
-void listInstallationTasks() Q_DECL_NOEXCEPT_EXPR(false)
+void listInstallationTasks() noexcept(false)
 {
     dbus.connectToPackager();
 
@@ -898,7 +898,7 @@ void listInstallationTasks() Q_DECL_NOEXCEPT_EXPR(false)
 }
 
 
-void cancelInstallationTask(bool all, const QString &singleTaskId) Q_DECL_NOEXCEPT_EXPR(false)
+void cancelInstallationTask(bool all, const QString &singleTaskId) noexcept(false)
 {
     dbus.connectToPackager();
 
@@ -974,7 +974,7 @@ void cancelInstallationTask(bool all, const QString &singleTaskId) Q_DECL_NOEXCE
     }
 }
 
-void listInstallationLocations() Q_DECL_NOEXCEPT_EXPR(false)
+void listInstallationLocations() noexcept(false)
 {
     dbus.connectToPackager();
 
@@ -984,7 +984,7 @@ void listInstallationLocations() Q_DECL_NOEXCEPT_EXPR(false)
     qApp->quit();
 }
 
-void showInstallationLocation(bool asJson) Q_DECL_NOEXCEPT_EXPR(false)
+void showInstallationLocation(bool asJson) noexcept(false)
 {
     dbus.connectToPackager();
 
@@ -1017,7 +1017,7 @@ void listInstances()
 
 void injectIntentRequest(const QString &intentId, bool isBroadcast,
                          const QString &requestingApplicationId, const QString &applicationId,
-                         const QString &jsonParameters) Q_DECL_NOEXCEPT_EXPR(false)
+                         const QString &jsonParameters) noexcept(false)
 {
     dbus.connectToManager();
 
diff --git a/src/tools/packager/packagingjob.cpp b/src/tools/packager/packagingjob.cpp
index 86b448eb..600980a0 100644
--- a/src/tools/packager/packagingjob.cpp
+++ b/src/tools/packager/packagingjob.cpp
@@ -111,7 +111,7 @@ int PackagingJob::resultCode() const
 PackagingJob::PackagingJob()
 { }
 
-void PackagingJob::execute() Q_DECL_NOEXCEPT_EXPR(false)
+void PackagingJob::execute() noexcept(false)
 {
     switch (m_mode) {
     case Create: {
diff --git a/src/tools/packager/packagingjob.h b/src/tools/packager/packagingjob.h
index 60ace5c4..d7536fa4 100644
--- a/src/tools/packager/packagingjob.h
+++ b/src/tools/packager/packagingjob.h
@@ -30,7 +30,7 @@ public:
     static PackagingJob *storeVerify(const QString &sourceName, const QStringList &certificateFiles,
                                      const QString &hardwareId);
 
-    void execute() Q_DECL_NOEXCEPT_EXPR(false);
+    void execute() noexcept(false);
 
     QString output() const;
     int resultCode() const;