diff options
| author | David Schulz <david.schulz@theqtcompany.com> | 2015-07-13 11:21:22 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2015-10-27 13:14:00 +0000 |
| commit | dbf1c2eb9f4e1feb24a58699b7b550016802e386 (patch) | |
| tree | b087f5b1ab6f1e224985911f93002f648021df3c /qmake/library/qmakeevaluator.cpp | |
| parent | 2f83e38bfc02f790162d2a2cdcbaef668d39448d (diff) | |
QMake: Add option to set qt.conf file.
Change-Id: Ie5db11892ccf2d357773a4db6a0464bf27be9a26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'qmake/library/qmakeevaluator.cpp')
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index cfb95b946c..31be44eda7 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -992,6 +992,8 @@ void QMakeEvaluator::loadDefaults() vars[ProKey("QMAKE_QMAKE")] << ProString(m_option->qmake_abslocation); if (!m_option->qmake_args.isEmpty()) vars[ProKey("QMAKE_ARGS")] = ProStringList(m_option->qmake_args); + if (!m_option->qtconf.isEmpty()) + vars[ProKey("QMAKE_QTCONF")] = ProString(m_option->qtconf); vars[ProKey("QMAKE_HOST.cpu_count")] = ProString(QString::number(idealThreadCount())); #if defined(Q_OS_WIN32) vars[ProKey("QMAKE_HOST.os")] << ProString("Windows"); |