diff options
| author | Matthew Dawson <matthew@mjdsystems.ca> | 2015-02-14 14:55:54 -0500 |
|---|---|---|
| committer | Matthew Dawson <matthew@mjdsystems.ca> | 2015-02-14 14:55:54 -0500 |
| commit | 10e459d02ff3a8c76b053ba31381e643a4434782 (patch) | |
| tree | f4c0540132f4e79ff684915a33aa4c12666da2f4 /autotests/test_kconf_update.cpp | |
| parent | 9eee15917e01a89d937d1cba2eebbe9d65daeb72 (diff) | |
| download | kconfig-10e459d02ff3a8c76b053ba31381e643a4434782.tar.gz kconfig-10e459d02ff3a8c76b053ba31381e643a4434782.tar.bz2 | |
Revert "Revert the SIC in commit 915976c1238be811f169eab1b02f7e8dad6410e0."
This reverts commit 9eee15917e01a89d937d1cba2eebbe9d65daeb72. As agreed
with David Faure, we are going to leave this change in place for 5.7 and
see what happens.
CCMAIL: faure@kde.org
CHANGELOG: Reverts previous commit, both can be left out of the changelog.
Diffstat (limited to 'autotests/test_kconf_update.cpp')
| -rw-r--r-- | autotests/test_kconf_update.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/autotests/test_kconf_update.cpp b/autotests/test_kconf_update.cpp index ff4939a3..e4e2b416 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("MigrateWhenFileDoesntHaveVersion") + QTest::newRow("DontMigrateWhenFileDoesntHaveVersion") << "File=testrc\n" "Group=group\n" @@ -276,15 +276,12 @@ void TestKConfUpdate::test_data() << "testrc" << - "[$Version]\n" - "update_info=%1\n" - "\n" "[group]\n" - "new=value\n" + "old=value\n" << "" << false - << true + << false ; QTest::newRow("DontMigrateWhenUpdateCantDoItMissingFilename") |