mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-05-03 16:25:54 +08:00
committed by
Mathew Sutcliffe
parent
81f7bde310
commit
ace3b60062
@@ -233,17 +233,6 @@ namespace BlackMisc
|
|||||||
return QProcessEnvironment::systemEnvironment().value(envVarDevelopment());
|
return QProcessEnvironment::systemEnvironment().value(envVarDevelopment());
|
||||||
}
|
}
|
||||||
|
|
||||||
const QString &CProject::envDevelopmentSetup()
|
|
||||||
{
|
|
||||||
static const QString s("SWIFT_DEV_SETUP");
|
|
||||||
return s;
|
|
||||||
}
|
|
||||||
|
|
||||||
QString CProject::envDevelopmentSetupValue()
|
|
||||||
{
|
|
||||||
return QProcessEnvironment::systemEnvironment().value(envDevelopmentSetup());
|
|
||||||
}
|
|
||||||
|
|
||||||
const QString &CProject::envVarPrivateSetupDir()
|
const QString &CProject::envVarPrivateSetupDir()
|
||||||
{
|
{
|
||||||
static const QString s("SWIFT_SETUP_DIR");
|
static const QString s("SWIFT_SETUP_DIR");
|
||||||
@@ -317,11 +306,7 @@ namespace BlackMisc
|
|||||||
|
|
||||||
QString CProject::getEnvironmentVariables(const QString &separator)
|
QString CProject::getEnvironmentVariables(const QString &separator)
|
||||||
{
|
{
|
||||||
QString e(envDevelopmentSetup());
|
QString e(envVarDevelopment());
|
||||||
e = e.append(": ").append(envDevelopmentSetupValue());
|
|
||||||
e = e.append(separator);
|
|
||||||
|
|
||||||
e = e.append(envVarDevelopment());
|
|
||||||
e = e.append(": ").append(envVarDevelopmentValue());
|
e = e.append(": ").append(envVarDevelopmentValue());
|
||||||
e = e.append(separator);
|
e = e.append(separator);
|
||||||
|
|
||||||
@@ -390,6 +375,7 @@ namespace BlackMisc
|
|||||||
str.append(compiledWithInfo(false));
|
str.append(compiledWithInfo(false));
|
||||||
return str;
|
return str;
|
||||||
}
|
}
|
||||||
|
|
||||||
} // ns
|
} // ns
|
||||||
|
|
||||||
#undef BLACK_VERSION_STR
|
#undef BLACK_VERSION_STR
|
||||||
|
|||||||
@@ -140,23 +140,14 @@ namespace BlackMisc
|
|||||||
static const QString &envVarDevelopment();
|
static const QString &envVarDevelopment();
|
||||||
|
|
||||||
//! Value
|
//! Value
|
||||||
//! //! \value true|false
|
//! \return true|false
|
||||||
static QString envVarDevelopmentValue();
|
static QString envVarDevelopmentValue();
|
||||||
|
|
||||||
//! Read data from productive or development setupnding on dev. environment yes/no
|
//! Environment variable private resources directory
|
||||||
static const QString &envDevelopmentSetup();
|
|
||||||
|
|
||||||
//! Value
|
|
||||||
//! \value true|false
|
|
||||||
//! \remarks If this is set, the explicit value will be used.
|
|
||||||
//! If not set, default will be used depe
|
|
||||||
static QString envDevelopmentSetupValue();
|
|
||||||
|
|
||||||
//! Environment variable private resources
|
|
||||||
static const QString &envVarPrivateSetupDir();
|
static const QString &envVarPrivateSetupDir();
|
||||||
|
|
||||||
//! Value
|
//! Value
|
||||||
//! \value directory path
|
//! \return directory path
|
||||||
static QString envVarPrivateSetupDirValue();
|
static QString envVarPrivateSetupDirValue();
|
||||||
};
|
};
|
||||||
} // ns
|
} // ns
|
||||||
|
|||||||
Reference in New Issue
Block a user