3 files changed, 35 insertions, 2 deletions
diff --git a/tests/auto/other/compiler/.prev_CMakeLists.txt b/tests/auto/other/compiler/.prev_CMakeLists.txt
new file mode 100644
index 0000000000..6824640d93
--- /dev/null
+++ b/tests/auto/other/compiler/.prev_CMakeLists.txt
@@ -0,0 +1,16 @@
+# Generated from compiler.pro.
+
+#####################################################################
+## tst_compiler Test:
+#####################################################################
+
+add_qt_test(tst_compiler
+    SOURCES
+        baseclass.cpp baseclass.h
+        derivedclass.cpp derivedclass.h
+        othersource.cpp
+        tst_compiler.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/other/compiler/CMakeLists.txt b/tests/auto/other/compiler/CMakeLists.txt
new file mode 100644
index 0000000000..1849b7ec2c
--- /dev/null
+++ b/tests/auto/other/compiler/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Generated from compiler.pro.
+
+#####################################################################
+## tst_compiler Test:
+#####################################################################
+
+add_qt_test(tst_compiler
+    EXCEPTIONS # special case
+    SOURCES
+        baseclass.cpp baseclass.h
+        derivedclass.cpp derivedclass.h
+        othersource.cpp
+        tst_compiler.cpp
+)
+
+## Scopes:
+#####################################################################
diff --git a/tests/auto/other/compiler/tst_compiler.cpp b/tests/auto/other/compiler/tst_compiler.cpp
index de15f4c62d..78026665be 100644
--- a/tests/auto/other/compiler/tst_compiler.cpp
+++ b/tests/auto/other/compiler/tst_compiler.cpp
@@ -634,7 +634,7 @@ void tst_Compiler::cxx11_alignas()
     struct S {
         alignas(double) char c;
     };
-    QCOMPARE(Q_ALIGNOF(S), Q_ALIGNOF(double));
+    QCOMPARE(alignof(S), alignof(double));
 #endif
 }
 
@@ -1396,7 +1396,7 @@ void tst_Compiler::cxx11_unrestricted_unions()
         ~U() {}
     };
     U u;
-    std::aligned_storage<sizeof(QString), Q_ALIGNOF(QString)> as;
+    std::aligned_storage<sizeof(QString), alignof(QString)> as;
     Q_UNUSED(u);
     Q_UNUSED(as);