Remove the profile name from the unique product name

If the product is multiplexed by profile, its name is already uniquified
by the multiplex id. If the product is not multiplexed, we don't need to
make the name unique.
This removes references to the top-level profile name from the build
directory structure, which can be helpful when rebuilding with a
different profile name, but the same effective properties. Also, it
shortens the paths of generated artifacts in the common case.

Change-Id: I1586049b9650542732a64be4b7d5f2db4428d87e
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp
index 43a82839a..18cafead9 100644
--- a/tests/auto/blackbox/tst_blackboxjava.cpp
+++ b/tests/auto/blackbox/tst_blackboxjava.cpp
@@ -94,7 +94,7 @@ void TestBlackboxJava::android()
     for (int i = 0; i < productNames.count(); ++i) {
         const QString productName = productNames.at(i);
         QVERIFY(m_qbsStdout.contains("Creating " + productName.toLocal8Bit() + ".apk"));
-        const QString apkFilePath = relativeProductBuildDir(productName, p.name())
+        const QString apkFilePath = relativeProductBuildDir(productName)
                 + '/' + productName + ".apk";
         QVERIFY2(regularFileExists(apkFilePath), qPrintable(apkFilePath));
         const QString jarFilePath = findExecutable(QStringList("jar"));