Uncomment disabled code in QSettings autotest.

The code in question was already commented out before the test was added
to the Qt repository in 2006.  After changing the code to use
QFile::rename() for portability, the test appears to pass.

Change-Id: I52a8578a47da419cabf5826b633cc4f2ac2c5218
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2012-03-13 15:18:48 +10:00 committed by Qt by Nokia
parent cbc883da69
commit b72fd8482e

View File

@ -1486,11 +1486,9 @@ void tst_QSettings::sync()
settings1.sync();
QCOMPARE(settings1.allKeys().count(), 0);
/*
// Now "some other app" will change software.org.conf
unlink((userConfDir + "software.org.ini").toLatin1());
rename((userConfDir + "other.software.org.ini").toLatin1(),
(userConfDir + "software.org.ini").toLatin1());
// Now "some other app" will change software.org.ini
QVERIFY(QFile::rename((userConfDir + "other.software.org.ini").toLatin1(),
(userConfDir + "software.org.ini").toLatin1()));
settings1.sync();
QCOMPARE(settings1.value("alpha/beta/geometry").toInt(), -7);
@ -1505,7 +1503,6 @@ void tst_QSettings::sync()
QCOMPARE(settings1.value("moo/beta/geometry/height").toInt(), 4);
QCOMPARE(settings1.value("moo/gamma/splitter").toInt(), 5);
QCOMPARE(settings1.allKeys().count(), 11);
*/
}
void tst_QSettings::setFallbacksEnabled_data()