forked from qt-creator/qt-creator
Core: Use qtcEnvironmentVariable* instead of qEnvironmentVariable*
And instead of qgetenv. Takes Qt Creator's setting at "Environment > System > Environment" into account, which makes it easier on some platforms to set them (e.g. macOS), can be configured differently in different settings paths, and potentially can be changed at runtime (depending on usage). Change-Id: Idfc8a7e255b4a0527f4651d6f9e5334e95b4351f Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
@@ -12,8 +12,9 @@
|
||||
#include <extensionsystem/pluginmanager.h>
|
||||
|
||||
#include <utils/algorithm.h>
|
||||
#include <utils/qtcassert.h>
|
||||
#include <utils/environment.h>
|
||||
#include <utils/fileutils.h>
|
||||
#include <utils/qtcassert.h>
|
||||
|
||||
#include <QApplication>
|
||||
#include <QDebug>
|
||||
@@ -856,9 +857,9 @@ QString ICore::systemInformation()
|
||||
return result;
|
||||
}
|
||||
|
||||
static const QByteArray &screenShotsPath()
|
||||
static const QString &screenShotsPath()
|
||||
{
|
||||
static const QByteArray path = qgetenv("QTC_SCREENSHOTS_PATH");
|
||||
static const QString path = qtcEnvironmentVariable("QTC_SCREENSHOTS_PATH");
|
||||
return path;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user