aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2024-01-12 10:29:46 +0100
committerChristian Kandeler <christian.kandeler@qt.io>2024-01-12 10:29:46 +0100
commit20de9f30104cec9b29f6c08cea1ae3da4e556a5f (patch)
treed99ac3aa1aed1b96f9570d0a371970f4a7ccb613 /src/lib/corelib
parent4b5b7fbd3316434fe6ed2d6edc5191f0d994ad2f (diff)
parentaa044048f0b3573ddda09d1b7a4483af9eed3de4 (diff)
Merge 2.2 into master
Diffstat (limited to 'src/lib/corelib')
-rw-r--r--src/lib/corelib/jsextensions/pkgconfigjs.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/corelib/jsextensions/pkgconfigjs.cpp b/src/lib/corelib/jsextensions/pkgconfigjs.cpp
index d84c42d8e..e663c537f 100644
--- a/src/lib/corelib/jsextensions/pkgconfigjs.cpp
+++ b/src/lib/corelib/jsextensions/pkgconfigjs.cpp
@@ -241,6 +241,7 @@ PkgConfig::Options PkgConfigJs::convertOptions(const QProcessEnvironment &env, c
[](const QString &str){ return str.toStdString(); });
result.disableUninstalled = map.value(QStringLiteral("disableUninstalled"), true).toBool();
result.staticMode = map.value(QStringLiteral("staticMode"), false).toBool();
+ result.definePrefix = map.value(QStringLiteral("definePrefix"), false).toBool();
result.mergeDependencies = map.value(QStringLiteral("mergeDependencies"), true).toBool();
result.globalVariables =
variablesFromQVariantMap(map.value(QStringLiteral("globalVariables")).toMap());