diff --git a/src/corelib/io/qloggingregistry_p.h b/src/corelib/io/qloggingregistry_p.h index f4eec4ccfc3..28d64b7cf2c 100644 --- a/src/corelib/io/qloggingregistry_p.h +++ b/src/corelib/io/qloggingregistry_p.h @@ -99,7 +99,7 @@ class QLoggingRegistry { Q_DISABLE_COPY_MOVE(QLoggingRegistry) public: - Q_AUTOTEST_EXPORT QLoggingRegistry(); + QLoggingRegistry(); Q_AUTOTEST_EXPORT void initializeRules(); diff --git a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp index b3af31ac27b..94e6bafa408 100644 --- a/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp +++ b/tests/auto/corelib/io/qloggingregistry/tst_qloggingregistry.cpp @@ -232,12 +232,14 @@ private slots: out << "Digia.*=false\n"; file.close(); - QLoggingRegistry registry; + QLoggingRegistry ®istry = *QLoggingRegistry::instance(); + auto cleanup = qScopeGuard([&] { + file.remove(); + registry.initializeRules(); // reset rules + }); + registry.initializeRules(); QCOMPARE(registry.ruleSets[QLoggingRegistry::ConfigRules].size(), 1); - - // remove file again - QVERIFY(file.remove()); } void QLoggingRegistry_rulePriorities()