5 files changed, 31 insertions, 6 deletions
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);
 
diff --git a/tests/auto/other/lancelot/lancelot.pro b/tests/auto/other/lancelot/lancelot.pro
index 6ece7315ed..5b9117983a 100644
--- a/tests/auto/other/lancelot/lancelot.pro
+++ b/tests/auto/other/lancelot/lancelot.pro
@@ -1,6 +1,7 @@
 CONFIG += testcase
 TARGET = tst_lancelot
 QT += testlib gui-private
+qtConfig(opengl): QT += opengl
 
 SOURCES += tst_lancelot.cpp \
            paintcommands.cpp
diff --git a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
index 0e61647e76..ed38976d94 100644
--- a/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/other/qaccessibility/tst_qaccessibility.cpp
@@ -203,11 +203,15 @@ private slots:
     void applicationTest();
     void mainWindowTest();
     void subWindowTest();
+#if QT_CONFIG(shortcut)
     void buttonTest();
+#endif
     void scrollBarTest();
     void tabTest();
     void tabWidgetTest();
+#if QT_CONFIG(shortcut)
     void menuTest();
+#endif
     void spinBoxTest();
     void doubleSpinBoxTest();
     void textEditTest();
@@ -234,8 +238,10 @@ private slots:
     void dockWidgetTest();
     void comboBoxTest();
     void accessibleName();
+#if QT_CONFIG(shortcut)
     void labelTest();
     void accelerators();
+#endif
     void bridgeTest();
     void focusChild();
 
@@ -1027,6 +1033,8 @@ public Q_SLOTS:
     }
 };
 
+#if QT_CONFIG(shortcut)
+
 void tst_QAccessibility::buttonTest()
 {
     QWidget window;
@@ -1199,6 +1207,8 @@ void tst_QAccessibility::buttonTest()
 //    test->release();
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QAccessibility::scrollBarTest()
 {
     QScrollBar *scrollBar  = new QScrollBar(Qt::Horizontal);
@@ -1408,6 +1418,8 @@ void tst_QAccessibility::tabWidgetTest()
     QTestAccessibility::clearEvents();
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QAccessibility::menuTest()
 {
     {
@@ -1618,6 +1630,8 @@ void tst_QAccessibility::menuTest()
     QTestAccessibility::clearEvents();
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QAccessibility::spinBoxTest()
 {
     QSpinBox * const spinBox = new QSpinBox();
@@ -3630,6 +3644,8 @@ void tst_QAccessibility::comboBoxTest()
     QTestAccessibility::clearEvents();
 }
 
+#if QT_CONFIG(shortcut)
+
 void tst_QAccessibility::labelTest()
 {
     QWidget *window = new QWidget;
@@ -3730,6 +3746,8 @@ void tst_QAccessibility::accelerators()
     QTestAccessibility::clearEvents();
 }
 
+#endif // QT_CONFIG(shortcut)
+
 #ifdef QT_SUPPORTS_IACCESSIBLE2
 static IUnknown *queryIA2(IAccessible *acc, const IID &iid)
 {
diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
index 260ba12a97..9285d5b5da 100644
--- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
@@ -91,7 +91,9 @@ private slots:
     void checkReason_BackTab();
     void checkReason_Popup();
     void checkReason_focusWidget();
+#if QT_CONFIG(shortcut)
     void checkReason_Shortcut();
+#endif
     void checkReason_ActiveWindow();
 
 private:
@@ -250,6 +252,8 @@ QT_BEGIN_NAMESPACE
 QT_END_NAMESPACE
 #endif
 
+#if QT_CONFIG(shortcut)
+
 void tst_QFocusEvent::checkReason_Shortcut()
 {
     initWidget();
@@ -288,6 +292,8 @@ void tst_QFocusEvent::checkReason_Shortcut()
 #endif
 }
 
+#endif // QT_CONFIG(shortcut)
+
 void tst_QFocusEvent::checkReason_focusWidget()
 {
     // This test checks that a widget doesn't loose
diff --git a/tests/auto/other/toolsupport/tst_toolsupport.cpp b/tests/auto/other/toolsupport/tst_toolsupport.cpp
index ab7bca8322..9591eca16a 100644
--- a/tests/auto/other/toolsupport/tst_toolsupport.cpp
+++ b/tests/auto/other/toolsupport/tst_toolsupport.cpp
@@ -97,14 +97,14 @@ void tst_toolsupport::offsets_data()
     {
         QTestData &data = QTest::newRow("sizeof(QObjectData)")
                 << sizeof(QObjectData);
-        data << 28 << 48; // vptr + 3 ptr + 2 int + ptr
+        data << 36 << 64; // vptr + 2 ptr + (2*ptr + int) + 2 int + ptr
     }
 
 #if RUN_MEMBER_OFFSET_TEST
     {
         QTestData &data = QTest::newRow("QObjectPrivate::extraData")
                 << pmm_to_offsetof(&QObjectPrivate::extraData);
-        data << 28 << 48;    // sizeof(QObjectData)
+        data << 36 << 64;    // sizeof(QObjectData)
     }
 
     {
@@ -126,9 +126,9 @@ void tst_toolsupport::offsets_data()
 #ifdef Q_PROCESSOR_X86
         // x86 32-bit has weird alignment rules. Refer to QtPrivate::AlignOf in
         // qglobal.h for more details.
-        data << 152 << 224;
+        data << 184 << 288;
 #else
-        data << 156 << 224;
+        data << 188 << 288;
 #endif
     }
 #endif