diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-09-10 10:13:24 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-09-11 18:14:01 +0200 |
| commit | 771bd3d5185ddec6bd5727995babc428d516f07a (patch) | |
| tree | 82a5686f26d1c6c2e7a125f9d85c86e0de5b49d8 /src/app/qbs/commandlinefrontend.cpp | |
| parent | 25313e15c875d181338e14a2fce550e1a4b2a63c (diff) | |
| parent | ffa686782af8c494a3c96967e22c0307c10b1b80 (diff) | |
Merge branch '1.3' into master.
Conflicts:
qbs_version.pri
src/app/qbs/commandlinefrontend.cpp
src/lib/corelib/language/projectresolver.cpp
version.js
Change-Id: I6b8a09faed7970821955ac329b0c244ddffb037c
Diffstat (limited to 'src/app/qbs/commandlinefrontend.cpp')
| -rw-r--r-- | src/app/qbs/commandlinefrontend.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index 46a320678..7f4a12440 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -134,8 +134,12 @@ void CommandLineFrontend::start() QString profileName = userConfig.take(profileKey).toString(); if (profileName.isEmpty()) profileName = m_settings->defaultProfile(); - if (profileName.isEmpty()) - throw ErrorInfo(Tr::tr("No profile specified and no default profile exists.")); + if (profileName.isEmpty()) { + ErrorInfo error(Tr::tr("No profile specified and no default profile exists.")); + error.append(Tr::tr("To set a default profile, run " + "'qbs config defaultProfile <profile name>'.")); + throw error; + } const Preferences prefs(m_settings, profileName); params.setSearchPaths(prefs.searchPaths(QDir::cleanPath(QCoreApplication::applicationDirPath() + QLatin1String("/" QBS_RELATIVE_SEARCH_PATH)))); @@ -380,6 +384,7 @@ int CommandLineFrontend::runShell() { const ProductData productToRun = getTheOneRunnableProduct(); RunEnvironment runEnvironment = m_projects.first().getRunEnvironment(productToRun, + m_parser.installOptions(), QProcessEnvironment::systemEnvironment(), m_settings); return runEnvironment.runShell(); } @@ -451,6 +456,7 @@ int CommandLineFrontend::runTarget() .arg(productToRun.name())); } RunEnvironment runEnvironment = m_projects.first().getRunEnvironment(productToRun, + m_parser.installOptions(), QProcessEnvironment::systemEnvironment(), m_settings); return runEnvironment.runTarget(executableFilePath, m_parser.runArgs()); } catch (const ErrorInfo &error) { |