diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-06-19 15:06:20 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-06-20 14:12:51 +0000 |
| commit | 2997f90c257e993a81384dc9c47abc82ce0dde4a (patch) | |
| tree | 2a473b8380c471b659b6d9deec8247000968156e | |
| parent | f7a58addeafee793a9450fb5dd75514c74678f7d (diff) | |
Fix Xcode and Android probes
The second parameter to relativeProductBuildDir is the multiplex
configuration ID now, not the profile... so don't pass the profile name.
Change-Id: I9cbf020a95e36be10c70a7ea6f23fcaa33ffe981
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxapple.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxjava.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index b826545ce..1829d173e 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -742,7 +742,7 @@ QVariantMap TestBlackboxApple::findXcode(int *status) const int res = runQbs(params); if (status) *status = res; - QFile file(temp.path() + "/" + relativeProductBuildDir("find-xcode", "none") + QFile file(temp.path() + "/" + relativeProductBuildDir("find-xcode") + "/xcode.json"); if (!file.open(QIODevice::ReadOnly)) return QVariantMap { }; diff --git a/tests/auto/blackbox/tst_blackboxjava.cpp b/tests/auto/blackbox/tst_blackboxjava.cpp index 616cc5f44..aee3cce3f 100644 --- a/tests/auto/blackbox/tst_blackboxjava.cpp +++ b/tests/auto/blackbox/tst_blackboxjava.cpp @@ -48,7 +48,7 @@ QMap<QString, QString> TestBlackboxJava::findAndroid(int *status, const QString const int res = runQbs(params); if (status) *status = res; - QFile file(temp.path() + "/" + relativeProductBuildDir("find-android", profile) + QFile file(temp.path() + "/" + relativeProductBuildDir("find-android") + "/android.json"); if (!file.open(QIODevice::ReadOnly)) return QMap<QString, QString> { }; |