diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-08-07 00:10:11 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-14 20:21:06 +0200 |
| commit | 0bd21a8111f3ec3a515f4c9d1587e6770f229275 (patch) | |
| tree | 72ea05b06b988d87634287ef71e3e0c8b94da616 /src/corelib/mimetypes | |
| parent | 11b5825fa08f386d3475fa181d8d3b8738e9cd12 (diff) | |
QtCore: use new qEnvironmentVariableIs{Set,Empty}()
In particular, qEmergencyOut() is now completely exception-free.
Incidentally, this patch shows that Qt isn't consistent in how it
treats empty environment variables used as flags, but that is something
for a separate commit. This patch aims to be behaviour-preserving,
except in exceptional circumstances, of course.
Change-Id: Ie106e7b430e1ab086c40c81cc1e56cd0e5400cb4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/mimetypes')
| -rw-r--r-- | src/corelib/mimetypes/qmimeprovider.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index 1f7d06caa4..3b0e0f51a0 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -188,7 +188,7 @@ enum { bool QMimeBinaryProvider::isValid() { #if defined(QT_USE_MMAP) - if (!qgetenv("QT_NO_MIME_CACHE").isEmpty()) + if (!qEnvironmentVariableIsEmpty("QT_NO_MIME_CACHE")) return false; Q_ASSERT(m_cacheFiles.isEmpty()); // this method is only ever called once |