summaryrefslogtreecommitdiffstats
path: root/tests/environmentvariable
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2012-03-15 11:42:34 +0100
committerKarsten Heimrich <karsten.heimrich@nokia.com>2012-03-16 17:40:27 +0100
commitf60c03d5bb03ba42955ce309a1765795f33e9bc1 (patch)
tree636cce9bdbcbf9b0ce1d928f8fdfd9ebf29f28dd /tests/environmentvariable
parent5e0165328aebec9acbc3fc4679ef58857fe856fa (diff)
Fix formating and build with QT_NO_CAST_FROM_ASCII.
Change-Id: I00e4b1ec840d976dbfc7f0138726692a770aadba Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'tests/environmentvariable')
-rw-r--r--tests/environmentvariable/environmentvariabletest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/environmentvariable/environmentvariabletest.cpp b/tests/environmentvariable/environmentvariabletest.cpp
index b3088cfb2..453559a62 100644
--- a/tests/environmentvariable/environmentvariabletest.cpp
+++ b/tests/environmentvariable/environmentvariabletest.cpp
@@ -66,7 +66,7 @@ void EnvironmentVariableTest::testPersistentNonSystem()
QVERIFY2(ok, qPrintable(op.errorString()));
// Verify now...
- QSettings settings("HKEY_CURRENT_USER\\Environment", QSettings::NativeFormat);
+ QSettings settings(QLatin1String("HKEY_CURRENT_USER\\Environment"), QSettings::NativeFormat);
QVERIFY(value == settings.value(key).toString());
// Remove the setting
@@ -94,7 +94,7 @@ void EnvironmentVariableTest::testNonPersistentNonSystem()
QVERIFY2(ok, qPrintable(op.errorString()));
- QString comp = qgetenv(qPrintable(key));
+ QString comp = QString::fromLocal8Bit(qgetenv(qPrintable(key)));
QCOMPARE(value, comp);
}