Add a QT_ prefix to all (semi-) public defines

Change-Id: I813282d2bab51a81e3efcacfe0fcb5d9c4ac83b3
Reviewed-by: Dominik Holland <dominik.holland@qt.io>

16 files changed, 84 insertions, 84 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d7817a2..8f56195e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,7 @@ if(AM_COVERAGE)
     set(QT_BUILD_TESTS_BY_DEFAULT ON)
     add_compile_options(-fprofile-arcs -ftest-coverage)
     add_link_options(-fprofile-arcs -fprofile-generate --coverage)
-    add_compile_definitions(AM_COVERAGE)
+    add_compile_definitions(QT_AM_COVERAGE)
     link_libraries(gcov)
 
     set(GCOV_EXCLUDE
diff --git a/src/common-lib/crashhandler.cpp b/src/common-lib/crashhandler.cpp
index 8af4a45d..517f9ec4 100644
--- a/src/common-lib/crashhandler.cpp
+++ b/src/common-lib/crashhandler.cpp
@@ -278,7 +278,7 @@ QT_END_NAMESPACE_AM
 #  elif defined(Q_OS_MACOS)
 #    include <mach-o/dyld.h>
 #  endif
-#  if defined(AM_COVERAGE)
+#  if defined(QT_AM_COVERAGE)
 extern "C" {
 #    include <gcov.h>
 }
@@ -583,7 +583,7 @@ static void crashHandler(const char *why, int stackFramesToIgnore)
     signal(SIGTERM, SIG_IGN);
     kill(0, SIGTERM);
 
-#if defined(AM_COVERAGE)
+#if defined(QT_AM_COVERAGE)
     __gcov_dump();
 #endif
 
diff --git a/src/crypto-lib/CMakeLists.txt b/src/crypto-lib/CMakeLists.txt
index bd18f6d7..1f147061 100644
--- a/src/crypto-lib/CMakeLists.txt
+++ b/src/crypto-lib/CMakeLists.txt
@@ -41,7 +41,7 @@ qt_internal_extend_target(AppManCryptoPrivate CONDITION (UNIX AND NOT MACOS)
         libcryptofunction.cpp libcryptofunction.h
         signature_openssl.cpp
     DEFINES
-        AM_USE_LIBCRYPTO
+        QT_AM_USE_LIBCRYPTO
     PUBLIC_LIBRARIES
         Qt::Network
 )
diff --git a/src/crypto-lib/cryptography.cpp b/src/crypto-lib/cryptography.cpp
index 0e95436a..9f781db4 100644
--- a/src/crypto-lib/cryptography.cpp
+++ b/src/crypto-lib/cryptography.cpp
@@ -24,7 +24,7 @@
 #  include <Availability.h>
 #endif
 
-#if defined(AM_USE_LIBCRYPTO)
+#if defined(QT_AM_USE_LIBCRYPTO)
 #  include "libcryptofunction.h"
 
 QT_BEGIN_NAMESPACE_AM
@@ -34,7 +34,7 @@ static bool openSslInitialized = false;
 static bool loadOpenSsl3LegacyProvider = false;
 
 // clazy:excludeall=non-pod-global-static
-static AM_LIBCRYPTO_FUNCTION(ERR_error_string_n, void(*)(unsigned long, char *, size_t));
+static QT_AM_LIBCRYPTO_FUNCTION(ERR_error_string_n, void(*)(unsigned long, char *, size_t));
 
 QT_END_NAMESPACE_AM
 
@@ -67,7 +67,7 @@ QByteArray Cryptography::generateRandomBytes(int size)
 
 void Cryptography::initialize()
 {
-#if defined(AM_USE_LIBCRYPTO)
+#if defined(QT_AM_USE_LIBCRYPTO)
     QMutexLocker locker(initMutex());
     if (!openSslInitialized) {
         if (!LibCryptoFunctionBase::initialize(loadOpenSsl3LegacyProvider))
@@ -79,7 +79,7 @@ void Cryptography::initialize()
 
 void Cryptography::enableOpenSsl3LegacyProvider()
 {
-#if defined(AM_USE_LIBCRYPTO)
+#if defined(QT_AM_USE_LIBCRYPTO)
     QMutexLocker locker(initMutex());
     if (openSslInitialized)
         qCritical("Cryptography::enableOpenSsl3LegacyProvider() needs to be called before using any other crypto functions.");
@@ -96,7 +96,7 @@ QString Cryptography::errorString(qint64 osCryptoError, const char *errorDescrip
         result.append(QLatin1String(": "));
     }
 
-#if defined(AM_USE_LIBCRYPTO)
+#if defined(QT_AM_USE_LIBCRYPTO)
     if (osCryptoError) {
         char msg[512];
         msg[sizeof(msg) - 1] = 0;
diff --git a/src/crypto-lib/libcryptofunction.cpp b/src/crypto-lib/libcryptofunction.cpp
index c485529a..64acbaad 100644
--- a/src/crypto-lib/libcryptofunction.cpp
+++ b/src/crypto-lib/libcryptofunction.cpp
@@ -10,23 +10,23 @@
 #include "libcryptofunction.h"
 
 // we want at least openssl 1.0.1 or 1.1.0
-#define AM_MINIMUM_OPENSSL10_VERSION 0x1000100fL
-#define AM_MINIMUM_OPENSSL11_VERSION 0x1010000fL
-#define AM_MINIMUM_OPENSSL30_VERSION 0x3000000fL
+#define QT_AM_MINIMUM_OPENSSL10_VERSION 0x1000100fL
+#define QT_AM_MINIMUM_OPENSSL11_VERSION 0x1010000fL
+#define QT_AM_MINIMUM_OPENSSL30_VERSION 0x3000000fL
 
 QT_BEGIN_NAMESPACE_AM
 
 // clazy:excludeall=non-pod-global-static
-static AM_LIBCRYPTO_FUNCTION(SSLeay, unsigned long(*)(), 0);
-static AM_LIBCRYPTO_FUNCTION(OPENSSL_add_all_algorithms_noconf, void(*)());
-static AM_LIBCRYPTO_FUNCTION(ERR_load_crypto_strings, void(*)());
+static QT_AM_LIBCRYPTO_FUNCTION(SSLeay, unsigned long(*)(), 0);
+static QT_AM_LIBCRYPTO_FUNCTION(OPENSSL_add_all_algorithms_noconf, void(*)());
+static QT_AM_LIBCRYPTO_FUNCTION(ERR_load_crypto_strings, void(*)());
 
-static AM_LIBCRYPTO_FUNCTION(OpenSSL_version_num, unsigned long(*)(), 0);
-static AM_LIBCRYPTO_FUNCTION(OPENSSL_init_crypto, int(*)(uint64_t, void *), 0);
+static QT_AM_LIBCRYPTO_FUNCTION(OpenSSL_version_num, unsigned long(*)(), 0);
+static QT_AM_LIBCRYPTO_FUNCTION(OPENSSL_init_crypto, int(*)(uint64_t, void *), 0);
 
 struct OSSL_PROVIDER;
 struct OSSL_LIB_CTX;
-static AM_LIBCRYPTO_FUNCTION(OSSL_PROVIDER_load, OSSL_PROVIDER *(*)(OSSL_LIB_CTX *, const char *), nullptr);
+static QT_AM_LIBCRYPTO_FUNCTION(OSSL_PROVIDER_load, OSSL_PROVIDER *(*)(OSSL_LIB_CTX *, const char *), nullptr);
 
 QLibrary *Cryptography::LibCryptoFunctionBase::s_library = nullptr;
 bool Cryptography::LibCryptoFunctionBase::s_isOpenSSL11 = false;
@@ -65,10 +65,10 @@ bool Cryptography::LibCryptoFunctionBase::initialize(bool loadOpenSsl3LegacyProv
             version = am_SSLeay(); // 1.0
 
         if (version > 0) {
-            if (version >= AM_MINIMUM_OPENSSL11_VERSION) {
+            if (version >= QT_AM_MINIMUM_OPENSSL11_VERSION) {
                 s_isOpenSSL11 = true;
 
-                if (version >= AM_MINIMUM_OPENSSL30_VERSION) {
+                if (version >= QT_AM_MINIMUM_OPENSSL30_VERSION) {
                     s_isOpenSSL30 = true;
 
                     if (loadOpenSsl3LegacyProvider) {
@@ -84,13 +84,13 @@ bool Cryptography::LibCryptoFunctionBase::initialize(bool loadOpenSsl3LegacyProv
                                                | 8 /*OPENSSL_INIT_ADD_ALL_DIGESTS*/
                                                | 2 /*OPENSSL_INIT_LOAD_CRYPTO_STRINGS*/,
                                                nullptr) == 1);
-            } else if (version >= AM_MINIMUM_OPENSSL10_VERSION) {
+            } else if (version >= QT_AM_MINIMUM_OPENSSL10_VERSION) {
                 am_OPENSSL_add_all_algorithms_noconf();
                 am_ERR_load_crypto_strings();
                 return true;
             } else {
                 qCritical("Loaded libcrypto (%s), but the version is too old: 0x%08lx (minimum supported version is: 0x%08lx)",
-                          qPrintable(s_library->fileName()), version, AM_MINIMUM_OPENSSL10_VERSION);
+                          qPrintable(s_library->fileName()), version, QT_AM_MINIMUM_OPENSSL10_VERSION);
             }
         } else {
             qCritical("Could not get version information from libcrypto: neither of the symbols 'SSLeay' or 'OpenSSL_version_num' were found");
diff --git a/src/crypto-lib/libcryptofunction.h b/src/crypto-lib/libcryptofunction.h
index d13bcd2a..97156543 100644
--- a/src/crypto-lib/libcryptofunction.h
+++ b/src/crypto-lib/libcryptofunction.h
@@ -96,7 +96,7 @@ public:
     }
 };
 
-#define AM_LIBCRYPTO_FUNCTION(f, typeof_f, ...) Cryptography::LibCryptoFunction<typeof_f> am_ ## f(#f, ##__VA_ARGS__)
+#define QT_AM_LIBCRYPTO_FUNCTION(f, typeof_f, ...) Cryptography::LibCryptoFunction<typeof_f> am_ ## f(#f, ##__VA_ARGS__)
 
 }
 
diff --git a/src/crypto-lib/signature_openssl.cpp b/src/crypto-lib/signature_openssl.cpp
index 3ffd5010..caef4de7 100644
--- a/src/crypto-lib/signature_openssl.cpp
+++ b/src/crypto-lib/signature_openssl.cpp
@@ -29,37 +29,37 @@ struct d2i_of_void;
 typedef int pem_password_cb (char *, int, int, void *);
 
 // deleter
-static AM_LIBCRYPTO_FUNCTION(X509_free, void(*)(X509 *));
-static AM_LIBCRYPTO_FUNCTION(BIO_free, int(*)(BIO *), 0);
-static AM_LIBCRYPTO_FUNCTION(PKCS7_free, void(*)(PKCS7 *));
-static AM_LIBCRYPTO_FUNCTION(EVP_PKEY_free, void(*)(EVP_PKEY *));
-static AM_LIBCRYPTO_FUNCTION(PKCS12_free, void(*)(PKCS12 *));
-static AM_LIBCRYPTO_FUNCTION(X509_STORE_free, void(*)(X509_STORE *));
-static AM_LIBCRYPTO_FUNCTION(sk_pop_free, void(*)(STACK_OF_X509 *, void(*)(void *)));         // 1.0
-static AM_LIBCRYPTO_FUNCTION(OPENSSL_sk_pop_free, void(*)(STACK_OF_X509 *, void(*)(void *))); // 1.1
+static QT_AM_LIBCRYPTO_FUNCTION(X509_free, void(*)(X509 *));
+static QT_AM_LIBCRYPTO_FUNCTION(BIO_free, int(*)(BIO *), 0);
+static QT_AM_LIBCRYPTO_FUNCTION(PKCS7_free, void(*)(PKCS7 *));
+static QT_AM_LIBCRYPTO_FUNCTION(EVP_PKEY_free, void(*)(EVP_PKEY *));
+static QT_AM_LIBCRYPTO_FUNCTION(PKCS12_free, void(*)(PKCS12 *));
+static QT_AM_LIBCRYPTO_FUNCTION(X509_STORE_free, void(*)(X509_STORE *));
+static QT_AM_LIBCRYPTO_FUNCTION(sk_pop_free, void(*)(STACK_OF_X509 *, void(*)(void *)));         // 1.0
+static QT_AM_LIBCRYPTO_FUNCTION(OPENSSL_sk_pop_free, void(*)(STACK_OF_X509 *, void(*)(void *))); // 1.1
 
 // error handling
-static AM_LIBCRYPTO_FUNCTION(ERR_get_error, unsigned long(*)(), 4|64 /*ERR_R_INTERNAL_ERROR*/);
+static QT_AM_LIBCRYPTO_FUNCTION(ERR_get_error, unsigned long(*)(), 4|64 /*ERR_R_INTERNAL_ERROR*/);
 
 // create
-static AM_LIBCRYPTO_FUNCTION(BIO_ctrl, long(*)(BIO *, int, long, void *), 0);
-static AM_LIBCRYPTO_FUNCTION(d2i_PKCS12_bio, PKCS12 *(*)(BIO *, PKCS12 **), nullptr);
-static AM_LIBCRYPTO_FUNCTION(PKCS12_parse, int (*)(PKCS12 *, const char *, EVP_PKEY **, X509 **, STACK_OF_X509 **ca), 0);
-static AM_LIBCRYPTO_FUNCTION(PKCS7_sign, PKCS7 *(*)(X509 *, EVP_PKEY *, STACK_OF_X509 *, BIO *, int), nullptr);
-static AM_LIBCRYPTO_FUNCTION(BIO_new, BIO *(*)(BIO_METHOD *), nullptr);
-static AM_LIBCRYPTO_FUNCTION(BIO_s_mem, BIO_METHOD *(*)(), nullptr);
-static AM_LIBCRYPTO_FUNCTION(PEM_ASN1_write_bio, int (*)(i2d_of_void *, const char *, BIO *, void *, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *), 0);
-static AM_LIBCRYPTO_FUNCTION(i2d_PKCS7_bio, int (*)(BIO *, PKCS7 *), 0);
-static AM_LIBCRYPTO_FUNCTION(d2i_PKCS7_bio, PKCS7 *(*)(BIO *, PKCS7 **), nullptr);
+static QT_AM_LIBCRYPTO_FUNCTION(BIO_ctrl, long(*)(BIO *, int, long, void *), 0);
+static QT_AM_LIBCRYPTO_FUNCTION(d2i_PKCS12_bio, PKCS12 *(*)(BIO *, PKCS12 **), nullptr);
+static QT_AM_LIBCRYPTO_FUNCTION(PKCS12_parse, int (*)(PKCS12 *, const char *, EVP_PKEY **, X509 **, STACK_OF_X509 **ca), 0);
+static QT_AM_LIBCRYPTO_FUNCTION(PKCS7_sign, PKCS7 *(*)(X509 *, EVP_PKEY *, STACK_OF_X509 *, BIO *, int), nullptr);
+static QT_AM_LIBCRYPTO_FUNCTION(BIO_new, BIO *(*)(BIO_METHOD *), nullptr);
+static QT_AM_LIBCRYPTO_FUNCTION(BIO_s_mem, BIO_METHOD *(*)(), nullptr);
+static QT_AM_LIBCRYPTO_FUNCTION(PEM_ASN1_write_bio, int (*)(i2d_of_void *, const char *, BIO *, void *, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *), 0);
+static QT_AM_LIBCRYPTO_FUNCTION(i2d_PKCS7_bio, int (*)(BIO *, PKCS7 *), 0);
+static QT_AM_LIBCRYPTO_FUNCTION(d2i_PKCS7_bio, PKCS7 *(*)(BIO *, PKCS7 **), nullptr);
 
 // verify
-static AM_LIBCRYPTO_FUNCTION(BIO_new_mem_buf, BIO *(*)(const void *, int), nullptr);
-static AM_LIBCRYPTO_FUNCTION(PEM_ASN1_read_bio, void *(*)(d2i_of_void *, const char *, BIO *, void **, pem_password_cb *, void *), nullptr);
-static AM_LIBCRYPTO_FUNCTION(d2i_X509, X509 *(*)(X509 **, const unsigned char **, long), nullptr);     // 1.0
-static AM_LIBCRYPTO_FUNCTION(d2i_X509_AUX, X509 *(*)(X509 **, const unsigned char **, long), nullptr); // 1.1
-static AM_LIBCRYPTO_FUNCTION(X509_STORE_new, X509_STORE *(*)(), nullptr);
-static AM_LIBCRYPTO_FUNCTION(X509_STORE_add_cert, int (*)(X509_STORE *, X509 *), 0);
-static AM_LIBCRYPTO_FUNCTION(PKCS7_verify, int (*)(PKCS7 *, STACK_OF_X509 *, X509_STORE *, BIO *, BIO *, int), 0);
+static QT_AM_LIBCRYPTO_FUNCTION(BIO_new_mem_buf, BIO *(*)(const void *, int), nullptr);
+static QT_AM_LIBCRYPTO_FUNCTION(PEM_ASN1_read_bio, void *(*)(d2i_of_void *, const char *, BIO *, void **, pem_password_cb *, void *), nullptr);
+static QT_AM_LIBCRYPTO_FUNCTION(d2i_X509, X509 *(*)(X509 **, const unsigned char **, long), nullptr);     // 1.0
+static QT_AM_LIBCRYPTO_FUNCTION(d2i_X509_AUX, X509 *(*)(X509 **, const unsigned char **, long), nullptr); // 1.1
+static QT_AM_LIBCRYPTO_FUNCTION(X509_STORE_new, X509_STORE *(*)(), nullptr);
+static QT_AM_LIBCRYPTO_FUNCTION(X509_STORE_add_cert, int (*)(X509_STORE *, X509 *), 0);
+static QT_AM_LIBCRYPTO_FUNCTION(PKCS7_verify, int (*)(PKCS7 *, STACK_OF_X509 *, X509_STORE *, BIO *, BIO *, int), 0);
 
 struct OpenSslDeleter {
     static inline void cleanup(X509 *x509)
diff --git a/src/dbus-lib/dbuscontextadaptor.h b/src/dbus-lib/dbuscontextadaptor.h
index fa93a115..22979ebf 100644
--- a/src/dbus-lib/dbuscontextadaptor.h
+++ b/src/dbus-lib/dbuscontextadaptor.h
@@ -46,7 +46,7 @@ private:
 };
 
 
-#define AM_AUTHENTICATE_DBUS(RETURN_TYPE) \
+#define QT_AM_AUTHENTICATE_DBUS(RETURN_TYPE) \
 do { \
     if (!DBusPolicy::instance()->check(this, __FUNCTION__)) \
         return RETURN_TYPE(); \
diff --git a/src/main-lib/applicationmanageradaptor_dbus.cpp b/src/main-lib/applicationmanageradaptor_dbus.cpp
index 5562d17e..e8355a1f 100644
--- a/src/main-lib/applicationmanageradaptor_dbus.cpp
+++ b/src/main-lib/applicationmanageradaptor_dbus.cpp
@@ -83,19 +83,19 @@ bool ApplicationManagerAdaptor::windowManagerCompositorReady() const
 
 QStringList ApplicationManagerAdaptor::applicationIds()
 {
-    AM_AUTHENTICATE_DBUS(QStringList)
+    QT_AM_AUTHENTICATE_DBUS(QStringList)
     return ApplicationManager::instance()->applicationIds();
 }
 
 uint ApplicationManagerAdaptor::applicationRunState(const QString &id)
 {
-    AM_AUTHENTICATE_DBUS(uint)
+    QT_AM_AUTHENTICATE_DBUS(uint)
     return ApplicationManager::instance()->applicationRunState(id);
 }
 
 QStringList ApplicationManagerAdaptor::capabilities(const QString &id)
 {
-    AM_AUTHENTICATE_DBUS(QStringList)
+    QT_AM_AUTHENTICATE_DBUS(QStringList)
     return ApplicationManager::instance()->capabilities(id);
 }
 
@@ -111,7 +111,7 @@ bool ApplicationManagerAdaptor::debugApplication(const QString &id, const QStrin
 
 bool ApplicationManagerAdaptor::debugApplication(const QString &id, const QString &debugWrapper, const QtAM::UnixFdMap &redirections, const QString &documentUrl)
 {
-    AM_AUTHENTICATE_DBUS(bool)
+    QT_AM_AUTHENTICATE_DBUS(bool)
 
     QVector<int> stdioRedirections = { -1, -1, -1 };
 
@@ -145,7 +145,7 @@ bool ApplicationManagerAdaptor::debugApplication(const QString &id, const QStrin
 
 QVariantMap ApplicationManagerAdaptor::get(const QString &id)
 {
-    AM_AUTHENTICATE_DBUS(QVariantMap)
+    QT_AM_AUTHENTICATE_DBUS(QVariantMap)
     auto map = ApplicationManager::instance()->get(id);
     map.remove(qSL("application"));       // cannot marshall QObject *
     map.remove(qSL("applicationObject")); // cannot marshall QObject *
@@ -154,19 +154,19 @@ QVariantMap ApplicationManagerAdaptor::get(const QString &id)
 
 QString ApplicationManagerAdaptor::identifyApplication(qlonglong pid)
 {
-    AM_AUTHENTICATE_DBUS(QString)
+    QT_AM_AUTHENTICATE_DBUS(QString)
     return ApplicationManager::instance()->identifyApplication(pid);
 }
 
 QStringList ApplicationManagerAdaptor::identifyAllApplications(qlonglong pid)
 {
-    AM_AUTHENTICATE_DBUS(QStringList)
+    QT_AM_AUTHENTICATE_DBUS(QStringList)
     return ApplicationManager::instance()->identifyAllApplications(pid);
 }
 
 bool ApplicationManagerAdaptor::openUrl(const QString &url)
 {
-    AM_AUTHENTICATE_DBUS(bool)
+    QT_AM_AUTHENTICATE_DBUS(bool)
     return ApplicationManager::instance()->openUrl(url);
 }
 
@@ -182,7 +182,7 @@ bool ApplicationManagerAdaptor::startApplication(const QString &id, const QStrin
 
 bool ApplicationManagerAdaptor::startApplication(const QString &id, const QtAM::UnixFdMap &redirections, const QString &documentUrl)
 {
-    AM_AUTHENTICATE_DBUS(bool)
+    QT_AM_AUTHENTICATE_DBUS(bool)
 
     QVector<int> stdioRedirections = { -1, -1, -1 };
 
@@ -221,7 +221,7 @@ void ApplicationManagerAdaptor::stopAllApplications()
 
 void ApplicationManagerAdaptor::stopAllApplications(bool forceKill)
 {
-    AM_AUTHENTICATE_DBUS(void)
+    QT_AM_AUTHENTICATE_DBUS(void)
     ApplicationManager::instance()->stopAllApplications(forceKill);
 }
 
@@ -232,7 +232,7 @@ void ApplicationManagerAdaptor::stopApplication(const QString &id)
 
 void ApplicationManagerAdaptor::stopApplication(const QString &id, bool forceKill)
 {
-    AM_AUTHENTICATE_DBUS(void)
+    QT_AM_AUTHENTICATE_DBUS(void)
     ApplicationManager::instance()->stopApplication(id, forceKill);
 }
 
@@ -240,7 +240,7 @@ QString ApplicationManagerAdaptor::sendIntentRequestAs(const QString &requesting
                                                        const QString &intentId, const QString &applicationId,
                                                        const QString &jsonParameters)
 {
-    AM_AUTHENTICATE_DBUS(QString)
+    QT_AM_AUTHENTICATE_DBUS(QString)
 
     QDBusContext *dbusContext = DBusContextAdaptor::dbusContextFor(this);
     dbusContext->setDelayedReply(true);
@@ -301,7 +301,7 @@ void ApplicationManagerAdaptor::broadcastIntentRequestAs(const QString &requesti
                                                          const QString &intentId,
                                                          const QString &jsonParameters)
 {
-    AM_AUTHENTICATE_DBUS(void)
+    QT_AM_AUTHENTICATE_DBUS(void)
 
     QDBusContext *dbusContext = DBusContextAdaptor::dbusContextFor(this);
 
diff --git a/src/main-lib/packagemanageradaptor_dbus.cpp b/src/main-lib/packagemanageradaptor_dbus.cpp
index defb7d75..f47a3b33 100644
--- a/src/main-lib/packagemanageradaptor_dbus.cpp
+++ b/src/main-lib/packagemanageradaptor_dbus.cpp
@@ -123,31 +123,31 @@ QVariantMap PackageManagerAdaptor::documentLocation() const
 
 void PackageManagerAdaptor::acknowledgePackageInstallation(const QString &taskId)
 {
-    AM_AUTHENTICATE_DBUS(void)
+    QT_AM_AUTHENTICATE_DBUS(void)
     return PackageManager::instance()->acknowledgePackageInstallation(taskId);
 }
 
 bool PackageManagerAdaptor::cancelTask(const QString &taskId)
 {
-    AM_AUTHENTICATE_DBUS(bool)
+    QT_AM_AUTHENTICATE_DBUS(bool)
     return PackageManager::instance()->cancelTask(taskId);
 }
 
 int PackageManagerAdaptor::compareVersions(const QString &version1, const QString &version2)
 {
-    AM_AUTHENTICATE_DBUS(int)
+    QT_AM_AUTHENTICATE_DBUS(int)
     return PackageManager::instance()->compareVersions(version1, version2);
 }
 
 QStringList PackageManagerAdaptor::packageIds()
 {
-    AM_AUTHENTICATE_DBUS(QStringList)
+    QT_AM_AUTHENTICATE_DBUS(QStringList)
     return PackageManager::instance()->packageIds();
 }
 
 QVariantMap PackageManagerAdaptor::get(const QString &id)
 {
-    AM_AUTHENTICATE_DBUS(QVariantMap)
+    QT_AM_AUTHENTICATE_DBUS(QVariantMap)
     auto map = PackageManager::instance()->get(id);
     map.remove(qSL("package"));       // cannot marshall QObject *
     map.remove(qSL("packageObject")); // cannot marshall QObject *
@@ -156,20 +156,20 @@ QVariantMap PackageManagerAdaptor::get(const QString &id)
 
 qlonglong PackageManagerAdaptor::installedPackageSize(const QString &packageId)
 {
-    AM_AUTHENTICATE_DBUS(qlonglong)
+    QT_AM_AUTHENTICATE_DBUS(qlonglong)
     return PackageManager::instance()->installedPackageSize(packageId);
 }
 
 QVariantMap PackageManagerAdaptor::installedPackageExtraMetaData(const QString &packageId)
 {
-    AM_AUTHENTICATE_DBUS(QVariantMap)
+    QT_AM_AUTHENTICATE_DBUS(QVariantMap)
     const auto map = PackageManager::instance()->installedPackageExtraMetaData(packageId);
     return convertFromJSVariant(map).toMap();
 }
 
 QVariantMap PackageManagerAdaptor::installedPackageExtraSignedMetaData(const QString &packageId)
 {
-    AM_AUTHENTICATE_DBUS(QVariantMap)
+    QT_AM_AUTHENTICATE_DBUS(QVariantMap)
     const auto map = PackageManager::instance()->installedPackageExtraSignedMetaData(packageId);
     return convertFromJSVariant(map).toMap();
 }
@@ -181,42 +181,42 @@ QString PackageManagerAdaptor::removePackage(const QString &packageId, bool keep
 
 QString PackageManagerAdaptor::removePackage(const QString &packageId, bool keepDocuments, bool force)
 {
-    AM_AUTHENTICATE_DBUS(QString)
+    QT_AM_AUTHENTICATE_DBUS(QString)
     return PackageManager::instance()->removePackage(packageId, keepDocuments, force);
 }
 
 QString PackageManagerAdaptor::startPackageInstallation(const QString &sourceUrl)
 {
-    AM_AUTHENTICATE_DBUS(QString)
+    QT_AM_AUTHENTICATE_DBUS(QString)
     return PackageManager::instance()->startPackageInstallation(sourceUrl);
 }
 
 QString PackageManagerAdaptor::taskState(const QString &taskId)
 {
-    AM_AUTHENTICATE_DBUS(QString)
+    QT_AM_AUTHENTICATE_DBUS(QString)
     return taskStateToString(PackageManager::instance()->taskState(taskId));
 }
 
 QString PackageManagerAdaptor::taskPackageId(const QString &taskId)
 {
-    AM_AUTHENTICATE_DBUS(QString)
+    QT_AM_AUTHENTICATE_DBUS(QString)
     return PackageManager::instance()->taskPackageId(taskId);
 }
 
 QStringList PackageManagerAdaptor::activeTaskIds()
 {
-    AM_AUTHENTICATE_DBUS(QStringList)
+    QT_AM_AUTHENTICATE_DBUS(QStringList)
     return PackageManager::instance()->activeTaskIds();
 }
 
 bool PackageManagerAdaptor::validateDnsName(const QString &name)
 {
-    AM_AUTHENTICATE_DBUS(bool)
+    QT_AM_AUTHENTICATE_DBUS(bool)
     return PackageManager::instance()->validateDnsName(name);
 }
 
 bool PackageManagerAdaptor::validateDnsName(const QString &name, int minimumParts)
 {
-    AM_AUTHENTICATE_DBUS(bool)
+    QT_AM_AUTHENTICATE_DBUS(bool)
     return PackageManager::instance()->validateDnsName(name, minimumParts);
 }
diff --git a/src/main-lib/windowmanageradaptor_dbus.cpp b/src/main-lib/windowmanageradaptor_dbus.cpp
index a9492fd4..32207437 100644
--- a/src/main-lib/windowmanageradaptor_dbus.cpp
+++ b/src/main-lib/windowmanageradaptor_dbus.cpp
@@ -52,6 +52,6 @@ void WindowManagerAdaptor::setSlowAnimations(bool slow)
 
 bool WindowManagerAdaptor::makeScreenshot(const QString &filename, const QString &selector)
 {
-    AM_AUTHENTICATE_DBUS(bool)
+    QT_AM_AUTHENTICATE_DBUS(bool)
     return WindowManager::instance()->makeScreenshot(filename, selector);
 }
diff --git a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
index 499f2db1..0dd2371f 100644
--- a/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
+++ b/tests/auto/applicationinstaller/tst_applicationinstaller.cpp
@@ -441,7 +441,7 @@ void tst_PackageManager::packageInstallation()
             QVERIFY(m_failedSpy->wait(spyTimeout));
             QCOMPARE(m_failedSpy->first()[0].toString(), taskId);
 
-            AM_CHECK_ERRORSTRING(m_failedSpy->first()[2].toString(), errorString);
+            QT_AM_CHECK_ERRORSTRING(m_failedSpy->first()[2].toString(), errorString);
         } else {
             // ...in case of expected success
 
@@ -581,7 +581,7 @@ void tst_PackageManager::simulateErrorConditions()
 
     QVERIFY(m_failedSpy->wait(spyTimeout));
     QCOMPARE(m_failedSpy->first()[0].toString(), taskId);
-    AM_CHECK_ERRORSTRING(m_failedSpy->first()[2].toString(), errorString);
+    QT_AM_CHECK_ERRORSTRING(m_failedSpy->first()[2].toString(), errorString);
     clearSignalSpies();
 
     const auto afterFailed = functions.values("after-failed");
diff --git a/tests/auto/error-checking.h b/tests/auto/error-checking.h
index 3e85a393..0e207b88 100644
--- a/tests/auto/error-checking.h
+++ b/tests/auto/error-checking.h
@@ -8,7 +8,7 @@
 #include <QTest>
 
 // sadly this has to be a define for QVERIFY2() to work
-#define AM_CHECK_ERRORSTRING(_actual_errstr, _expected_errstr) do { \
+#define QT_AM_CHECK_ERRORSTRING(_actual_errstr, _expected_errstr) do { \
     if (_expected_errstr.startsWith(QLatin1String("~"))) { \
         QRegularExpression re(_expected_errstr.mid(1)); \
         QVERIFY2(re.match(_actual_errstr).hasMatch(), \
diff --git a/tests/auto/packagecreator/tst_packagecreator.cpp b/tests/auto/packagecreator/tst_packagecreator.cpp
index 304d883e..3218159b 100644
--- a/tests/auto/packagecreator/tst_packagecreator.cpp
+++ b/tests/auto/packagecreator/tst_packagecreator.cpp
@@ -95,7 +95,7 @@ void tst_PackageCreator::createAndVerify()
         QVERIFY(creator.errorCode() != Error::Canceled);
         QVERIFY(!creator.wasCanceled());
 
-        AM_CHECK_ERRORSTRING(creator.errorString(), errorString);
+        QT_AM_CHECK_ERRORSTRING(creator.errorString(), errorString);
         return;
     }
 
diff --git a/tests/auto/packageextractor/tst_packageextractor.cpp b/tests/auto/packageextractor/tst_packageextractor.cpp
index d1b1f05e..877966ef 100644
--- a/tests/auto/packageextractor/tst_packageextractor.cpp
+++ b/tests/auto/packageextractor/tst_packageextractor.cpp
@@ -153,7 +153,7 @@ void tst_PackageExtractor::extractAndVerify()
         QVERIFY(extractor.errorCode() != Error::Canceled);
         QVERIFY(!extractor.wasCanceled());
 
-        AM_CHECK_ERRORSTRING(extractor.errorString(), errorString);
+        QT_AM_CHECK_ERRORSTRING(extractor.errorString(), errorString);
         return;
     }
 
diff --git a/tests/auto/packager-tool/tst_packager-tool.cpp b/tests/auto/packager-tool/tst_packager-tool.cpp
index 3a8b6946..e8083e5d 100644
--- a/tests/auto/packager-tool/tst_packager-tool.cpp
+++ b/tests/auto/packager-tool/tst_packager-tool.cpp
@@ -277,7 +277,7 @@ void tst_PackagerTool::brokenMetadata()
 
     QString error;
     QVERIFY2(!packagerCheck(PackagingJob::create(pathTo("test.appkg"), tmp.path()), error), qPrintable(error));
-    AM_CHECK_ERRORSTRING(error, errorString);
+    QT_AM_CHECK_ERRORSTRING(error, errorString);
 }
 
 /*