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

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

5 files changed, 6 insertions, 6 deletions

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);
 }
 
 /*