diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-11-17 11:42:06 -0800 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-08-04 11:19:13 +0000 |
| commit | b12fd1fa9d0b64e3cb66fa68c85392dbde8e175b (patch) | |
| tree | 4ba59c7d4cff41eba27ac8eca2ba38f14f182f38 /src/corelib/io/qfile.h | |
| parent | 1f4fd599a8c7eaaf5373af19bf94c208d42707b2 (diff) | |
Long live qEnvironmentVariable()
[ChangeLog][QtCore] Added qEnvironmentVariable, which returns the value
of an environment variable in a QString, while qgetenv continues to be
used to return it in a QByteArray. For Unix, since most environment
variables seem to contain path names, qEnvironmentVariable will do the
same as QFile::decodeName, which means NFC/NFD conversion on Apple OSes.
I opted not to #include <qfile.h> from qglobal.cpp to implement that
QFile::decodeName functionality, so qglobal.cpp doesn't depend on
corelib/io and to avoid possible recursions.
Task-number: QTBUG-41006
Change-Id: I14839ba5678944c2864bffff141794b8aaa7aa28
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qfile.h')
| -rw-r--r-- | src/corelib/io/qfile.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index a2a1b25248..c5819e8076 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -81,6 +81,7 @@ public: } static QString decodeName(const QByteArray &localFileName) { + // note: duplicated in qglobal.cpp (qEnvironmentVariable) return QString::fromUtf8(localFileName).normalized(QString::NormalizationForm_C); } #else |