feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

setup {,x}qmakespec from environment as fallback

Browse Source 
... like qmake does

Change-Id: I4d0dedfea5efcd1b5df2c3043788edf4bbd5c5ad
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Oswald Buddenhagen
2012-08-21 13:48:27 +02:00
parent d0bc069e07
commit 2847db0ecb
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/shared/proparser/qmakeglobals.cpp
View File

@@ -206,6 +206,17 @@ void QMakeGlobals::commitCommandLineArguments(QMakeCmdLineParserState &state)
xqmakespec = qmakespec; xqmakespec = qmakespec;
} }
void QMakeGlobals::useEnvironment()
{
if (xqmakespec.isEmpty())
xqmakespec = getEnv(QLatin1String("XQMAKESPEC"));
if (qmakespec.isEmpty()) {
qmakespec = getEnv(QLatin1String("QMAKESPEC"));
if (xqmakespec.isEmpty())
xqmakespec = qmakespec;
}
}
void QMakeGlobals::setCommandLineArguments(const QString &pwd, const QStringList &_args) void QMakeGlobals::setCommandLineArguments(const QString &pwd, const QStringList &_args)
{ {
QStringList args = _args; QStringList args = _args;
@@ -214,6 +225,7 @@ void QMakeGlobals::setCommandLineArguments(const QString &pwd, const QStringList
for (int pos = 0; pos < args.size(); pos++) for (int pos = 0; pos < args.size(); pos++)
addCommandLineArguments(state, args, &pos); addCommandLineArguments(state, args, &pos);
commitCommandLineArguments(state); commitCommandLineArguments(state);
useEnvironment();
} }
void QMakeGlobals::setDirectories(const QString &input_dir, const QString &output_dir) void QMakeGlobals::setDirectories(const QString &input_dir, const QString &output_dir)

1
src/shared/proparser/qmakeglobals.h
View File

@@ -115,6 +115,7 @@ public:
QStringList &args, int *pos); QStringList &args, int *pos);
void commitCommandLineArguments(QMakeCmdLineParserState &state); void commitCommandLineArguments(QMakeCmdLineParserState &state);
void setCommandLineArguments(const QString &pwd, const QStringList &args); void setCommandLineArguments(const QString &pwd, const QStringList &args);
void useEnvironment();
void setDirectories(const QString &input_dir, const QString &output_dir); void setDirectories(const QString &input_dir, const QString &output_dir);
#ifdef PROEVALUATOR_INIT_PROPS #ifdef PROEVALUATOR_INIT_PROPS
bool initProperties(); bool initProperties();