From 30a61500c7b07d32fd49e548f6b5c99f6f30d254 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Dec 13 2023 09:32:12 +0000 Subject: Update to 2.2.1 --- diff --git a/.gitignore b/.gitignore index e1c7ef6..c94a89d 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /qbs-src-2.0.2.tar.gz /qbs-src-2.1.0.tar.gz /qbs-src-2.1.1.tar.gz +/qbs-src-2.2.1.tar.gz diff --git a/qbs.spec b/qbs.spec index 7488285..1f9eb94 100644 --- a/qbs.spec +++ b/qbs.spec @@ -10,14 +10,16 @@ Name: qbs # qbs was previously packaged as part of qt-creator, using the qt-creator version, hence the epoch bump Epoch: 1 -Version: 2.1.1 -Release: 4%{?dist} +Version: 2.2.1 +Release: 1%{?dist} Summary: Cross platform build tool # Fails to build on i686 ExcludeArch: i686 -# See LGPL_EXCEPTION.txt -License: LGPLv2 with exceptions and LGPLv3 with exceptions +# See https://doc.qt.io/qbs/attributions.html +# -docs and -examples have a separate license tag +# ( Qbs library and tools ) ( Shared functionality ) ( tests ) +License: LGPL-3.0-only AND GPL-2.0-only AND LGPL-2.1-only WITH Qt-LGPL-exception-1.1 AND LGPL-3.0-only AND GPL-3.0-only WITH QT-GPL-exception-1.0 URL: https://wiki.qt.io/qbs %if 0%{?commit:1} Source0: https://code.qt.io/cgit/qbs/qbs.git/snapshot/qbs-%{commit}.tar.xz @@ -76,6 +78,7 @@ developing applications that use %{name}. %package examples Summary: Example projects using %{name} +License: BSD-3-Clause Requires: %{name} = %{epoch}:%{version}-%{release} BuildArch: noarch @@ -130,7 +133,7 @@ rm %{buildroot}%{_bindir}/tst_* %doc README.md %{_bindir}/%{name}* %{_libdir}/%{name}/ -%{_libdir}/libqbs*.so.2.1* +%{_libdir}/libqbs*.so.2.2* %{_libexecdir}/qbs/ %{_datadir}/%{name}/ %{_mandir}/man1/%{name}.1* @@ -148,6 +151,9 @@ rm %{buildroot}%{_bindir}/tst_* %changelog +* Wed Dec 13 2023 Sandro Mani - 1:2.2.1-1 +- Update to 2.2.1 + * Wed Nov 29 2023 Jan Grulich - 1:2.1.1-4 - Rebuild (qt6) diff --git a/qbs_qmake.patch b/qbs_qmake.patch index af35af8..0e8eeb2 100644 --- a/qbs_qmake.patch +++ b/qbs_qmake.patch @@ -1,7 +1,25 @@ -diff -rupN --no-dereference qbs-src-2.1.1/share/qbs/module-providers/Qt/setup-qt.js qbs-src-2.1.1-new/share/qbs/module-providers/Qt/setup-qt.js ---- qbs-src-2.1.1/share/qbs/module-providers/Qt/setup-qt.js 2023-08-03 14:58:40.000000000 +0200 -+++ qbs-src-2.1.1-new/share/qbs/module-providers/Qt/setup-qt.js 2023-08-04 09:53:55.750810986 +0200 -@@ -57,16 +57,19 @@ function getQmakeFilePaths(qmakeFilePath +diff -rupN --no-dereference qbs-src-2.2.1/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js qbs-src-2.2.1-new/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js +--- qbs-src-2.2.1/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js 2023-12-12 14:40:58.000000000 +0100 ++++ qbs-src-2.2.1-new/share/qbs/imports/qbs/Probes/qbs-pkg-config-probe.js 2023-12-13 08:46:32.667872411 +0100 +@@ -74,7 +74,13 @@ function configureQt(pkg) { + return; + } + } +- var suffix = FileInfo.executableSuffix(); ++ var qtsuffix = ""; ++ if (packageName === "Qt5Core") { ++ qtsuffix = "-qt5; ++ } else if (packageName === "Qt6Core") { ++ qtsuffix = "-qt6; ++ } ++ var suffix = qtsuffix + FileInfo.executableSuffix(); + var qmakePaths = [FileInfo.joinPaths(binDir, "qmake" + suffix)]; + return QmakeProbeConfigure.configure(qmakePaths); + } +diff -rupN --no-dereference qbs-src-2.2.1/share/qbs/imports/qbs/Probes/qmake-probe.js qbs-src-2.2.1-new/share/qbs/imports/qbs/Probes/qmake-probe.js +--- qbs-src-2.2.1/share/qbs/imports/qbs/Probes/qmake-probe.js 2023-12-12 14:40:58.000000000 +0100 ++++ qbs-src-2.2.1-new/share/qbs/imports/qbs/Probes/qmake-probe.js 2023-12-13 08:46:32.671872392 +0100 +@@ -56,16 +56,19 @@ function getQmakeFilePaths(qmakeFilePath var pathValue = Environment.getEnv("PATH"); if (pathValue) { var dirs = splitNonEmpty(pathValue, FileInfo.pathListSeparator()); @@ -13,7 +31,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/share/qbs/module-providers/Qt/setup-qt - if (FileInfo.completeBaseName(canonicalCandidate) !== "qtchooser") - candidate = canonicalCandidate; - if (!filePaths.contains(candidate)) { -- console.info("Found Qt at '" + toNative(candidate) + "'."); +- console.info("Found Qt at '" + FileInfo.toNativeSeparators(candidate) + "'."); - filePaths.push(candidate); + var qtvers = ["-qt6", "-qt5", ""]; + for (var j = 0; j < qtvers.length; ++j) { @@ -25,7 +43,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/share/qbs/module-providers/Qt/setup-qt + if (FileInfo.completeBaseName(canonicalCandidate) !== "qtchooser") + candidate = canonicalCandidate; + if (!filePaths.contains(candidate)) { -+ console.info("Found Qt at '" + toNative(candidate) + "'."); ++ console.info("Found Qt at '" + FileInfo.toNativeSeparators(candidate) + "'."); + filePaths.push(candidate); + } } diff --git a/qbs_tst_blackbox_stderr.patch b/qbs_tst_blackbox_stderr.patch index ce3273e..913cd05 100644 --- a/qbs_tst_blackbox_stderr.patch +++ b/qbs_tst_blackbox_stderr.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp qbs-src-2.1.1-new/tests/auto/blackbox/tst_blackbox.cpp ---- qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp 2023-08-03 14:58:40.000000000 +0200 -+++ qbs-src-2.1.1-new/tests/auto/blackbox/tst_blackbox.cpp 2023-08-04 09:53:55.486810899 +0200 +diff -rupN --no-dereference qbs-src-2.2.1/tests/auto/blackbox/tst_blackbox.cpp qbs-src-2.2.1-new/tests/auto/blackbox/tst_blackbox.cpp +--- qbs-src-2.2.1/tests/auto/blackbox/tst_blackbox.cpp 2023-12-12 14:40:59.000000000 +0100 ++++ qbs-src-2.2.1-new/tests/auto/blackbox/tst_blackbox.cpp 2023-12-13 08:46:32.442873475 +0100 @@ -62,6 +62,20 @@ #define WAIT_FOR_NEW_TIMESTAMP() waitForNewTimestamp(testDataDir) @@ -20,9 +20,9 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q +} + using qbs::Internal::HostOsInfo; - using qbs::Profile; -@@ -3258,7 +3272,7 @@ void TestBlackbox::pluginDependency() + class MacosTarHealer { +@@ -3281,7 +3295,7 @@ void TestBlackbox::pluginDependency() // Build the app. Plugins 1 and 2 must not be linked. Plugin 3 must be linked. QCOMPARE(runQbs(QStringList{"--command-echo-mode", "command-line"}), 0); @@ -31,7 +31,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QVERIFY(!output.contains("plugin1")); QVERIFY(!output.contains("plugin2")); QVERIFY(!output.contains("helper2")); -@@ -3269,7 +3283,7 @@ void TestBlackbox::pluginDependency() +@@ -3292,7 +3306,7 @@ void TestBlackbox::pluginDependency() QCOMPARE(runQbs(QStringList{"-p", "plugin2"}), 0); QVERIFY2(!m_qbsStdout.contains("linking"), m_qbsStdout.constData()); QCOMPARE(runQbs(QStringList{"--command-echo-mode", "command-line"}), 0); @@ -40,7 +40,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QVERIFY2(!output.contains("plugin1"), output.constData()); QVERIFY2(!output.contains("helper2"), output.constData()); QVERIFY2(output.contains("plugin2"), output.constData()); -@@ -3278,7 +3292,7 @@ void TestBlackbox::pluginDependency() +@@ -3301,7 +3315,7 @@ void TestBlackbox::pluginDependency() WAIT_FOR_NEW_TIMESTAMP(); REPLACE_IN_FILE("plugin-dependency.qbs", "false /* marker 2 */", "true"); QCOMPARE(runQbs(QStringList{"-p", "helper1", "--command-echo-mode", "command-line"}), 0); @@ -49,7 +49,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QVERIFY2(output.contains("helper2"), output.constData()); // Check that the build dependency still works. -@@ -3461,7 +3475,7 @@ void TestBlackbox::propertyAssignmentOnN +@@ -3484,7 +3498,7 @@ void TestBlackbox::propertyAssignmentOnN { QDir::setCurrent(testDataDir + "/property-assignment-on-non-present-module"); QCOMPARE(runQbs(), 0); @@ -58,7 +58,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q } void TestBlackbox::propertyAssignmentInFailedModule() -@@ -5303,15 +5317,16 @@ void TestBlackbox::listPropertyOrder() +@@ -5326,15 +5340,16 @@ void TestBlackbox::listPropertyOrder() QDir::setCurrent(testDataDir + "/list-property-order"); const QbsRunParameters params(QStringList() << "-q"); QCOMPARE(runQbs(params), 0); @@ -78,7 +78,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q } void TestBlackbox::require() -@@ -5539,7 +5554,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5562,7 +5577,7 @@ void TestBlackbox::propertyPrecedence() // Case 1: [cmdline=0,prod=0,export=0,nonleaf=0,profile=0] QCOMPARE(runQbs(params), 0); @@ -87,7 +87,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QVERIFY2(m_qbsStdout.contains("scalar prop: leaf\n") && m_qbsStdout.contains("list prop: [\"leaf\"]\n"), -@@ -5549,7 +5564,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5572,7 +5587,7 @@ void TestBlackbox::propertyPrecedence() // Case 2: [cmdline=0,prod=0,export=0,nonleaf=0,profile=1] switchProfileContents(profile.p, s.get(), true); QCOMPARE(runQbs(resolveParams), 0); @@ -96,7 +96,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: profile\n") -@@ -5562,7 +5577,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5585,7 +5600,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), false); switchFileContents(nonleafFile, true); QCOMPARE(runQbs(resolveParams), 0); @@ -105,7 +105,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: nonleaf\n") && m_qbsStdout.contains("list prop: [\"nonleaf\",\"leaf\"]\n"), -@@ -5571,7 +5586,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5594,7 +5609,7 @@ void TestBlackbox::propertyPrecedence() // Case 4: [cmdline=0,prod=0,export=0,nonleaf=1,profile=1] switchProfileContents(profile.p, s.get(), true); QCOMPARE(runQbs(resolveParams), 0); @@ -114,7 +114,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: nonleaf\n") && m_qbsStdout.contains("list prop: [\"nonleaf\",\"profile\"]\n"), -@@ -5584,7 +5599,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5607,7 +5622,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(nonleafFile, false); switchFileContents(depFile, true); QCOMPARE(runQbs(resolveParams), 0); @@ -123,7 +123,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: export\n") && m_qbsStdout.contains("list prop: [\"export\",\"leaf\"]\n"), -@@ -5593,7 +5608,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5616,7 +5631,7 @@ void TestBlackbox::propertyPrecedence() // Case 6: [cmdline=0,prod=0,export=1,nonleaf=0,profile=1] switchProfileContents(profile.p, s.get(), true); QCOMPARE(runQbs(resolveParams), 0); @@ -132,7 +132,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: export\n") && m_qbsStdout.contains("list prop: [\"export\",\"profile\"]\n"), -@@ -5626,7 +5641,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5649,7 +5664,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(depFile, false); switchFileContents(productFile, true); QCOMPARE(runQbs(resolveParams), 0); @@ -141,7 +141,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: product\n") && m_qbsStdout.contains("list prop: [\"product\",\"leaf\"]\n"), -@@ -5635,7 +5650,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5658,7 +5673,7 @@ void TestBlackbox::propertyPrecedence() // Case 10: [cmdline=0,prod=1,export=0,nonleaf=0,profile=1] switchProfileContents(profile.p, s.get(), true); QCOMPARE(runQbs(resolveParams), 0); @@ -150,7 +150,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: product\n") && m_qbsStdout.contains("list prop: [\"product\",\"profile\"]\n"), -@@ -5645,7 +5660,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5668,7 +5683,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), false); switchFileContents(nonleafFile, true); QCOMPARE(runQbs(resolveParams), 0); @@ -159,7 +159,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: product\n") && m_qbsStdout.contains("list prop: [\"product\",\"nonleaf\",\"leaf\"]\n"), -@@ -5654,7 +5669,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5677,7 +5692,7 @@ void TestBlackbox::propertyPrecedence() // Case 12: [cmdline=0,prod=1,export=0,nonleaf=1,profile=1] switchProfileContents(profile.p, s.get(), true); QCOMPARE(runQbs(resolveParams), 0); @@ -168,7 +168,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: product\n") && m_qbsStdout.contains("list prop: [\"product\",\"nonleaf\",\"profile\"]\n"), -@@ -5665,7 +5680,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5688,7 +5703,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(nonleafFile, false); switchFileContents(depFile, true); QCOMPARE(runQbs(resolveParams), 0); @@ -177,7 +177,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: product\n") && m_qbsStdout.contains("list prop: [\"product\",\"export\",\"leaf\"]\n"), -@@ -5674,7 +5689,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5697,7 +5712,7 @@ void TestBlackbox::propertyPrecedence() // Case 14: [cmdline=0,prod=1,export=1,nonleaf=0,profile=1] switchProfileContents(profile.p, s.get(), true); QCOMPARE(runQbs(resolveParams), 0); @@ -186,7 +186,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: product\n") && m_qbsStdout.contains("list prop: [\"product\",\"export\",\"profile\"]\n"), -@@ -5684,7 +5699,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5707,7 +5722,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), false); switchFileContents(nonleafFile, true); QCOMPARE(runQbs(resolveParams), 0); @@ -195,7 +195,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: product\n") && m_qbsStdout.contains("list prop: [\"product\",\"export\",\"nonleaf\",\"leaf\"]\n"), -@@ -5693,7 +5708,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5716,7 +5731,7 @@ void TestBlackbox::propertyPrecedence() // Case 16: [cmdline=0,prod=1,export=1,nonleaf=1,profile=1] switchProfileContents(profile.p, s.get(), true); QCOMPARE(runQbs(resolveParams), 0); @@ -204,7 +204,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: product\n") && m_qbsStdout.contains("list prop: [\"product\",\"export\",\"nonleaf\",\"profile\"]\n"), -@@ -5707,7 +5722,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5730,7 +5745,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(productFile, false); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -213,7 +213,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5717,7 +5732,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5740,7 +5755,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -222,7 +222,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5728,7 +5743,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5751,7 +5766,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(nonleafFile, true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -231,7 +231,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5738,7 +5753,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5761,7 +5776,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -240,7 +240,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5750,7 +5765,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5773,7 +5788,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(depFile, true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -249,7 +249,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5760,7 +5775,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5783,7 +5798,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -258,7 +258,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5771,7 +5786,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5794,7 +5809,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(nonleafFile, true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -267,7 +267,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5781,7 +5796,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5804,7 +5819,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -276,7 +276,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5794,7 +5809,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5817,7 +5832,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(productFile, true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -285,7 +285,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5804,7 +5819,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5827,7 +5842,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -294,7 +294,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5815,7 +5830,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5838,7 +5853,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(nonleafFile, true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -303,7 +303,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5825,7 +5840,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5848,7 +5863,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -312,7 +312,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5837,7 +5852,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5860,7 +5875,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(depFile, true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -321,7 +321,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5847,7 +5862,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5870,7 +5885,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -330,7 +330,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5858,7 +5873,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5881,7 +5896,7 @@ void TestBlackbox::propertyPrecedence() switchFileContents(nonleafFile, true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -339,7 +339,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5868,7 +5883,7 @@ void TestBlackbox::propertyPrecedence() +@@ -5891,7 +5906,7 @@ void TestBlackbox::propertyPrecedence() switchProfileContents(profile.p, s.get(), true); resolveParams.arguments << "modules.leaf.scalarProp:cmdline" << "modules.leaf.listProp:cmdline"; QCOMPARE(runQbs(resolveParams), 0); @@ -348,7 +348,7 @@ diff -rupN --no-dereference qbs-src-2.1.1/tests/auto/blackbox/tst_blackbox.cpp q QCOMPARE(runQbs(params), 0); QVERIFY2(m_qbsStdout.contains("scalar prop: cmdline\n") && m_qbsStdout.contains("list prop: [\"cmdline\"]\n"), -@@ -5925,7 +5940,7 @@ void TestBlackbox::propertiesInExportIte +@@ -5948,7 +5963,7 @@ void TestBlackbox::propertiesInExportIte QCOMPARE(runQbs(), 0); QVERIFY(regularFileExists(relativeExecutableFilePath("p1"))); QVERIFY(regularFileExists(relativeExecutableFilePath("p2"))); diff --git a/sources b/sources index ab51066..42e329b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qbs-src-2.1.1.tar.gz) = 32b5a33920484d2e72cd45e3309f980539813815ff39b4f5ca2269556bdb46d02e204732cf23e9e2b1a9afad258ab8e5bcfc612bd94f64d5dbeb1fcf3cc74e90 +SHA512 (qbs-src-2.2.1.tar.gz) = 7db5b752466a285388d314ea21ef0372ded5e5557431fbc666a964560c89cf9a958a43acc10d02aba3f707b384422355d2ca7897d69abb3ff27b5fc32cd60dd1