Improve error messages for the generate command

Change-Id: Ifdd203c6bb1617916c79f7533fb52e9f2859d5e4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 10 insertions, 7 deletions

diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index cc08e4b16..c1e9415c9 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -504,16 +504,19 @@ void CommandLineFrontend::generate()
     const QString generatorName = m_parser.generateOptions().generatorName();
     auto generator = ProjectGeneratorManager::findGenerator(generatorName);
     if (!generator) {
-        const QString generatorNames = ProjectGeneratorManager::loadedGeneratorNames()
-                .join(QLatin1String("\n\t"));
-        if (generatorName.isEmpty()) {
+        const auto generatorNames = ProjectGeneratorManager::loadedGeneratorNames();
+        if (!generatorNames.empty()) {
+            const QString generatorNamesString = generatorNames.join(QLatin1String("\n\t"));
+            if (!generatorName.isEmpty()) {
+                throw ErrorInfo(Tr::tr("No generator named '%1'. Available generators:\n\t%2")
+                                .arg(generatorName, generatorNamesString));
+            }
+
             throw ErrorInfo(Tr::tr("No generator specified. Available generators:\n\t%1")
-                            .arg(generatorNames));
+                            .arg(generatorNamesString));
         }
 
-        throw ErrorInfo(Tr::tr("No generator named '%1'. Available generators:\n\t%2")
-                        .arg(generatorName)
-                        .arg(generatorNames));
+        throw ErrorInfo(Tr::tr("No generator specified or no generators are available."));
     }
 
     generator->generate(m_projects,