8 files changed, 39 insertions, 1 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp
index 978fdbb7a..c848b24d0 100644
--- a/src/app/qbs/commandlinefrontend.cpp
+++ b/src/app/qbs/commandlinefrontend.cpp
@@ -146,6 +146,7 @@ void CommandLineFrontend::start()
         params.setDryRun(m_parser.dryRun());
         params.setForceProbeExecution(m_parser.forceProbesExecution());
         params.setWaitLockBuildGraph(m_parser.waitLockBuildGraph());
+        params.setFallbackProviderEnabled(!m_parser.disableFallbackProvider());
         params.setLogElapsedTime(m_parser.logTime());
         params.setSettingsDirectory(m_settings->baseDirectory());
         params.setOverrideBuildGraphData(m_parser.command() == ResolveCommandType);
diff --git a/src/app/qbs/parser/commandlineoption.cpp b/src/app/qbs/parser/commandlineoption.cpp
index e18658751..dc5b4e440 100644
--- a/src/app/qbs/parser/commandlineoption.cpp
+++ b/src/app/qbs/parser/commandlineoption.cpp
@@ -681,6 +681,17 @@ QString WaitLockOption::longRepresentation() const
     return QLatin1String("--wait-lock");
 }
 
+QString DisableFallbackProviderOption::description(CommandType) const
+{
+    return Tr::tr("%1\n\tDo not fall back to pkg-config if a dependency is not found.\n")
+            .arg(longRepresentation());
+}
+
+QString DisableFallbackProviderOption::longRepresentation() const
+{
+    return QLatin1String("--no-fallback-module-provider");
+}
+
 QString RunEnvConfigOption::description(CommandType command) const
 {
     Q_UNUSED(command);
diff --git a/src/app/qbs/parser/commandlineoption.h b/src/app/qbs/parser/commandlineoption.h
index d57ec76b7..414f90489 100644
--- a/src/app/qbs/parser/commandlineoption.h
+++ b/src/app/qbs/parser/commandlineoption.h
@@ -75,6 +75,7 @@ public:
         GeneratorOptionType,
         WaitLockOptionType,
         RunEnvConfigOptionType,
+        DisableFallbackProviderType,
     };
 
     virtual ~CommandLineOption();
@@ -414,6 +415,14 @@ public:
     QString longRepresentation() const override;
 };
 
+class DisableFallbackProviderOption : public OnOffOption
+{
+public:
+    QString description(CommandType command) const override;
+    QString shortRepresentation() const override { return QString(); }
+    QString longRepresentation() const override;
+};
+
 } // namespace qbs
 
 #endif // QBS_COMMANDLINEOPTION_H
diff --git a/src/app/qbs/parser/commandlineoptionpool.cpp b/src/app/qbs/parser/commandlineoptionpool.cpp
index 9964f051a..63711f623 100644
--- a/src/app/qbs/parser/commandlineoptionpool.cpp
+++ b/src/app/qbs/parser/commandlineoptionpool.cpp
@@ -128,6 +128,9 @@ CommandLineOption *CommandLineOptionPool::getOption(CommandLineOption::Type type
         case CommandLineOption::WaitLockOptionType:
             option = new WaitLockOption;
             break;
+        case CommandLineOption::DisableFallbackProviderType:
+            option = new DisableFallbackProviderOption;
+            break;
         case CommandLineOption::RunEnvConfigOptionType:
             option = new RunEnvConfigOption;
             break;
@@ -273,6 +276,12 @@ WaitLockOption *CommandLineOptionPool::waitLockOption() const
     return static_cast<WaitLockOption *>(getOption(CommandLineOption::WaitLockOptionType));
 }
 
+DisableFallbackProviderOption *CommandLineOptionPool::disableFallbackProviderOption() const
+{
+    return static_cast<DisableFallbackProviderOption *>(
+                getOption(CommandLineOption::DisableFallbackProviderType));
+}
+
 RunEnvConfigOption *CommandLineOptionPool::runEnvConfigOption() const
 {
     return static_cast<RunEnvConfigOption *>(getOption(CommandLineOption::RunEnvConfigOptionType));
diff --git a/src/app/qbs/parser/commandlineoptionpool.h b/src/app/qbs/parser/commandlineoptionpool.h
index 6a4669165..c7ac263e1 100644
--- a/src/app/qbs/parser/commandlineoptionpool.h
+++ b/src/app/qbs/parser/commandlineoptionpool.h
@@ -77,6 +77,7 @@ public:
     RespectProjectJobLimitsOption *respectProjectJobLimitsOption() const;
     GeneratorOption *generatorOption() const;
     WaitLockOption *waitLockOption() const;
+    DisableFallbackProviderOption *disableFallbackProviderOption() const;
     RunEnvConfigOption *runEnvConfigOption() const;
 
 private:
diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index c2e265336..2ec0df1df 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -231,6 +231,11 @@ bool CommandLineParser::waitLockBuildGraph() const
     return d->optionPool.waitLockOption()->enabled();
 }
 
+bool CommandLineParser::disableFallbackProvider() const
+{
+    return d->optionPool.disableFallbackProviderOption()->enabled();
+}
+
 bool CommandLineParser::logTime() const
 {
     return d->logTime;
diff --git a/src/app/qbs/parser/commandlineparser.h b/src/app/qbs/parser/commandlineparser.h
index e2ef8ad77..d47657b16 100644
--- a/src/app/qbs/parser/commandlineparser.h
+++ b/src/app/qbs/parser/commandlineparser.h
@@ -76,6 +76,7 @@ public:
     bool dryRun() const;
     bool forceProbesExecution() const;
     bool waitLockBuildGraph() const;
+    bool disableFallbackProvider() const;
     bool logTime() const;
     bool withNonDefaultProducts() const;
     bool buildBeforeInstalling() const;
diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp
index 33f93ce53..79636ff0a 100644
--- a/src/app/qbs/parser/parsercommand.cpp
+++ b/src/app/qbs/parser/parsercommand.cpp
@@ -210,7 +210,8 @@ static QList<CommandLineOption::Type> resolveOptions()
             << CommandLineOption::ShowProgressOptionType
             << CommandLineOption::DryRunOptionType
             << CommandLineOption::ForceProbesOptionType
-            << CommandLineOption::LogTimeOptionType;
+            << CommandLineOption::LogTimeOptionType
+            << CommandLineOption::DisableFallbackProviderType;
 }
 
 QList<CommandLineOption::Type> ResolveCommand::supportedOptions() const