diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-02-10 09:51:52 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-02-10 10:00:08 +0100 |
| commit | 4481ddd23cc1b83bf7a1fd45cd2d5d47360a3527 (patch) | |
| tree | aa16cad1e02438c02f42b489ce8e14bd7f618432 /src/app | |
| parent | 1355ac20ed6bda381bb9e03df568b0a6b7976e06 (diff) | |
| parent | 6deab2a10313ea7a7cf5ebb1be56384f5bc71368 (diff) | |
Merge 1.7 into master
Change-Id: I4ca26628cb30ca75ceab0ca38d8bb253193b6166
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/qbs/commandlinefrontend.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index 906d9f983..5342ca00d 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -508,7 +508,8 @@ void CommandLineFrontend::generate() generator->generate(m_projects, m_parser.buildConfigurations(), - m_parser.installOptions(QString())); + m_parser.installOptions(QString()), + m_parser.settingsDir()); } int CommandLineFrontend::runTarget() |