1 files changed, 16 insertions, 1 deletions
diff --git a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
index e074aeb3e9..d7733bad02 100644
--- a/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
+++ b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp
@@ -53,12 +53,27 @@ private slots:
 
 void tst_QGetPutEnv::getSetCheck()
 {
-    const char* varName = "should_not_exist";
+    const char varName[] = "should_not_exist";
+
+    QVERIFY(!qEnvironmentVariableIsSet(varName));
+    QVERIFY(qEnvironmentVariableIsEmpty(varName));
     QByteArray result = qgetenv(varName);
     QCOMPARE(result, QByteArray());
+
+#ifndef Q_OS_WIN
+    QVERIFY(qputenv(varName, "")); // deletes varName instead of making it empty, on Windows
+
+    QVERIFY(qEnvironmentVariableIsSet(varName));
+    QVERIFY(qEnvironmentVariableIsEmpty(varName));
+#endif
+
     QVERIFY(qputenv(varName, QByteArray("supervalue")));
+
+    QVERIFY(qEnvironmentVariableIsSet(varName));
+    QVERIFY(!qEnvironmentVariableIsEmpty(varName));
     result = qgetenv(varName);
     QVERIFY(result == "supervalue");
+
     qputenv(varName,QByteArray());
 }