2 files changed, 14 insertions, 11 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index f82a87235c..ecad92c33c 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -144,22 +144,22 @@ QT_BEGIN_NAMESPACE
     \sa QProcess, QProcess::systemEnvironment(), QProcess::setProcessEnvironment()
 */
 #ifdef Q_OS_WIN
-static inline QProcessEnvironmentPrivate::Unit prepareName(const QString &name)
+static inline QProcessEnvironmentPrivate::Key prepareName(const QString &name)
 { return name.toUpper(); }
-static inline QString nameToString(const QProcessEnvironmentPrivate::Unit &name)
+static inline QString nameToString(const QProcessEnvironmentPrivate::Key &name)
 { return name; }
-static inline QProcessEnvironmentPrivate::Unit prepareValue(const QString &value)
+static inline QProcessEnvironmentPrivate::Value prepareValue(const QString &value)
 { return value; }
-static inline QString valueToString(const QProcessEnvironmentPrivate::Unit &value)
+static inline QString valueToString(const QProcessEnvironmentPrivate::Value &value)
 { return value; }
 #else
-static inline QProcessEnvironmentPrivate::Unit prepareName(const QString &name)
+static inline QProcessEnvironmentPrivate::Key prepareName(const QString &name)
 { return name.toLocal8Bit(); }
-static inline QString nameToString(const QProcessEnvironmentPrivate::Unit &name)
+static inline QString nameToString(const QProcessEnvironmentPrivate::Key &name)
 { return QString::fromLocal8Bit(name); }
-static inline QProcessEnvironmentPrivate::Unit prepareValue(const QString &value)
+static inline QProcessEnvironmentPrivate::Value prepareValue(const QString &value)
 { return value.toLocal8Bit(); }
-static inline QString valueToString(const QProcessEnvironmentPrivate::Unit &value)
+static inline QString valueToString(const QProcessEnvironmentPrivate::Value &value)
 { return QString::fromLocal8Bit(value); }
 #endif
 
diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h
index 7bfcb311f9..b2a69ef905 100644
--- a/src/corelib/io/qprocess_p.h
+++ b/src/corelib/io/qprocess_p.h
@@ -85,11 +85,14 @@ class QProcessEnvironmentPrivate: public QSharedData
 {
 public:
 #ifdef Q_OS_WIN
-    typedef QString Unit;
+    typedef QString Key;
+    typedef QString Value;
 #else
-    typedef QByteArray Unit;
+    typedef QByteArray Key;
+    typedef QByteArray Value;
 #endif
-    typedef QHash<Unit, Unit> Hash;
+
+    typedef QHash<Key, Value> Hash;
     Hash hash;
 
     static QProcessEnvironment fromList(const QStringList &list);