From 9eee15917e01a89d937d1cba2eebbe9d65daeb72 Mon Sep 17 00:00:00 2001 From: Matthew Dawson Date: Sat, 14 Feb 2015 01:15:55 -0500 Subject: Revert the SIC in commit 915976c1238be811f169eab1b02f7e8dad6410e0. On further reflection, introducing a SIC to fix the bug is not ideal. I'm working on something that will address the underlying bug, but I didn't have it in time for 5.7. The versioning behaviour is left, as I do want it to exist for the future. This only reverts the mandatory versioning of files to avoid the compatibility break. CHANGELOG: Undo 915976c123, which never saw a release, enough to avoid the SIC. --- autotests/test_kconf_update.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'autotests/test_kconf_update.cpp') diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp index e4e2b416..ff4939a3 100644 --- a/autotests/test_kconf_update.cpp +++ b/autotests/test_kconf_update.cpp @@ -262,7 +262,7 @@ void TestKConfUpdate::test_data() << true << true ; - QTest::newRow("DontMigrateWhenFileDoesntHaveVersion") + QTest::newRow("MigrateWhenFileDoesntHaveVersion") << "File=testrc\n" "Group=group\n" @@ -276,12 +276,15 @@ void TestKConfUpdate::test_data() << "testrc" << + "[$Version]\n" + "update_info=%1\n" + "\n" "[group]\n" - "old=value\n" + "new=value\n" << "" << false - << false + << true ; QTest::newRow("DontMigrateWhenUpdateCantDoItMissingFilename") -- cgit v1.2.1