diff options
| author | Kai Dohmen <psykai1993@googlemail.com> | 2023-02-15 08:48:18 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2023-04-09 12:46:29 +0000 |
| commit | d915a579290e0a8c6212b272a75eae4dcb48ad0a (patch) | |
| tree | 7366dad355b538fff9df5b16270da5ad267cb019 | |
| parent | 289aac0aa1cccb2ef66a17f572aeb59236c6bd29 (diff) | |
| download | qbs-d915a579290e0a8c6212b272a75eae4dcb48ad0a.tar.gz | |
Only setup Qt in qbspkgconfig when not cross compiling
When cross compiling the qmake binary pointed to by the pkg-config-file
might contain the wrong qmake. For simplicity just deactivate setting up
Qt when cross compiling.
Fixes: QBS-1717
Change-Id: I1f856b1f8f918ea09b3280c2f672d0f7db2b8f5f
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | share/qbs/module-providers/qbspkgconfig.qbs | 4 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxqt.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/share/qbs/module-providers/qbspkgconfig.qbs b/share/qbs/module-providers/qbspkgconfig.qbs index ccd08febd..92d5fda71 100644 --- a/share/qbs/module-providers/qbspkgconfig.qbs +++ b/share/qbs/module-providers/qbspkgconfig.qbs @@ -211,7 +211,9 @@ ModuleProvider { continue; } if (packageName.startsWith("Qt")) { - setupQt(pkg); + if (!sysroot) { + setupQt(pkg); + } continue; } var moduleName = getModuleName(moduleMapping[packageName] diff --git a/tests/auto/blackbox/tst_blackboxqt.cpp b/tests/auto/blackbox/tst_blackboxqt.cpp index e42ca26c1..53738f46c 100644 --- a/tests/auto/blackbox/tst_blackboxqt.cpp +++ b/tests/auto/blackbox/tst_blackboxqt.cpp @@ -392,6 +392,8 @@ void TestBlackboxQt::pkgconfigQt_data() QTest::newRow("pkgconfig") << QStringList() << true; QTest::newRow("dummy") << QStringList({"products.p.qbsModuleProviders:dummyProvider"}) << false; + QTest::newRow("cross-compiling") + << QStringList({"moduleProviders.qbspkgconfig.sysroot:/some/fake/sysroot"}) << false; } void TestBlackboxQt::pluginMetaData() |