1 files changed, 19 insertions, 12 deletions
diff --git a/tests/auto/inputpanel/tst_inputpanel.cpp b/tests/auto/inputpanel/tst_inputpanel.cpp
index 5030d405..41a3f967 100644
--- a/tests/auto/inputpanel/tst_inputpanel.cpp
+++ b/tests/auto/inputpanel/tst_inputpanel.cpp
@@ -7,18 +7,25 @@
 #include <QFileInfo>
 #include <QDir>
 
-static bool s_configEnv = qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard"));
-static bool initStandardPaths() {
-    QStandardPaths::setTestModeEnabled(true);
-    auto configLocations = QStringList()
-            << QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/qtvirtualkeyboard"
-            << QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/qtvirtualkeyboard";
-    for (const QString &configLocation : configLocations) {
-        if (configLocation != "/qtvirtualkeyboard")
-            QDir(configLocation).removeRecursively();
+namespace
+{
+
+struct VirtualKeyboardSetup : QObject
+{
+    VirtualKeyboardSetup()
+    {
+        qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard"));
+        QStandardPaths::setTestModeEnabled(true);
+        auto configLocations = QStringList()
+                << QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/qtvirtualkeyboard"
+                << QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/qtvirtualkeyboard";
+        for (const QString &configLocation : configLocations) {
+            if (configLocation != "/qtvirtualkeyboard")
+                QDir(configLocation).removeRecursively();
+        }
     }
-    return true;
+};
+
 }
-static bool s_initStandardPaths = initStandardPaths();
 
-QUICK_TEST_MAIN(inputpanel)
+QUICK_TEST_MAIN_WITH_SETUP(inputpanel, VirtualKeyboardSetup)