2 files changed, 6 insertions, 5 deletions
diff --git a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
index 1ef2cf8e3f..526a5039b0 100644
--- a/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
+++ b/tests/auto/corelib/kernel/qmetamethod/tst_qmetamethod.cpp
@@ -714,9 +714,8 @@ void tst_QMetaMethod::comparisonOperators()
 void tst_QMetaMethod::fromSignal()
 {
 #define FROMSIGNAL_HELPER(ObjectType, Name, Arguments)  { \
-        void (ObjectType::*signal)Arguments = &ObjectType::Name; \
         const QMetaObject *signalMeta = &ObjectType::staticMetaObject; \
-        QCOMPARE(QMetaMethod::fromSignal(signal), \
+        QCOMPARE(QMetaMethod::fromSignal(&ObjectType::Name), \
             signalMeta->method(signalMeta->indexOfSignal(QMetaObject::normalizedSignature(#Name #Arguments)))); \
     }
 
diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index b4985df8d4..54663ba3a3 100644
--- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -319,10 +319,11 @@ void tst_QFileDialog2::emptyUncPath()
 }
 
 #if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_MENU)
-struct MenuCloser {
+struct MenuCloser : public QObject {
     QWidget *w;
     explicit MenuCloser(QWidget *w) : w(w) {}
-    void operator()() const
+
+    void close()
     {
         QMenu *menu = qFindChild<QMenu*>(w);
         if (!menu) {
@@ -342,7 +343,8 @@ static bool openContextMenu(QFileDialog &fd)
     QTimer timer;
     timer.setInterval(300);
     timer.setSingleShot(true);
-    QObject::connect(&timer, &QTimer::timeout, MenuCloser(&fd));
+    MenuCloser closer(&fd);
+    QObject::connect(&timer, &QTimer::timeout, &closer, &MenuCloser::close);
     timer.start();
     QContextMenuEvent cme(QContextMenuEvent::Mouse, QPoint(10, 10));
     qApp->sendEvent(list->viewport(), &cme); // blocks until menu is closed again.