diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2022-01-27 22:32:47 +0300 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2022-01-28 16:46:34 +0000 |
| commit | f726d465ff6365846e5a78f61e2cedd6e9ff6609 (patch) | |
| tree | 4fb25f8ca72a188acef6e983cab4f5cfb6073a9e | |
| parent | d3e44609fd28268b525d12853e90b53d9e3f2183 (diff) | |
Fix build
Both branches of the ternary operator have to have the same type.
Change-Id: I429509adec209aacadf85bb5f8ea0573d92a4e95
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxandroid.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/blackbox/tst_blackboxandroid.cpp b/tests/auto/blackbox/tst_blackboxandroid.cpp index 8109299cc..812e005bb 100644 --- a/tests/auto/blackbox/tst_blackboxandroid.cpp +++ b/tests/auto/blackbox/tst_blackboxandroid.cpp @@ -221,7 +221,7 @@ void TestBlackboxAndroid::android_data() const bool usesClang = (forQt ? pQt : p).value(QStringLiteral("qbs.toolchainType")) .toString() == "clang"; const QByteArray path = "lib/${ARCH}/"; - return path + (usesClang ? "libc++_shared.so" : oldcxxLib); + return path + (usesClang ? QByteArrayLiteral("libc++_shared.so") : oldcxxLib); }; qbs::Version version(5, 13); QStringList qmakeFilePaths = pQt.value(QStringLiteral("moduleProviders.Qt.qmakeFilePaths")). @@ -259,7 +259,7 @@ void TestBlackboxAndroid::android_data() auto expandArchs = [] (const QByteArrayList &archs, const QByteArrayList &lst, bool aabPackage) { const QByteArray &archPlaceHolder = "${ARCH}"; QByteArrayList result; - QByteArray base( aabPackage ? "base/" : QByteArray()); + QByteArray base( aabPackage ? "base/" : ""); for (const QByteArray &entry : lst) { if (entry.contains(archPlaceHolder)) { for (const QByteArray &arch : qAsConst(archs)) |