diff options
| -rw-r--r-- | tests/auto/blackbox/blackbox.pro | 1 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/language/language.pro | 1 | ||||
| -rw-r--r-- | tests/auto/tools/tools.pro | 1 |
4 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/blackbox/blackbox.pro b/tests/auto/blackbox/blackbox.pro index 63fdd45e8..f007910ab 100644 --- a/tests/auto/blackbox/blackbox.pro +++ b/tests/auto/blackbox/blackbox.pro @@ -1,5 +1,6 @@ TEMPLATE = app TARGET = tst_blackbox +DESTDIR = $$OUT_PWD DEPENDPATH += . INCLUDEPATH += . ../../../src/lib/ DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 224de65b1..113c8e7ff 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -34,12 +34,9 @@ static QString initQbsExecutableFilePath() { QString filePath = QCoreApplication::applicationDirPath() + QLatin1String("/../../../"); - if (qbs::HostOsInfo::isWindowsHost()) - filePath += QLatin1String("../"); filePath += "bin/qbs"; filePath = qbs::HostOsInfo::appendExecutableSuffix(QDir::cleanPath(filePath)); return filePath; - } TestBlackbox::TestBlackbox() diff --git a/tests/auto/language/language.pro b/tests/auto/language/language.pro index 1adb37b89..5965c6c0e 100644 --- a/tests/auto/language/language.pro +++ b/tests/auto/language/language.pro @@ -1,5 +1,6 @@ TEMPLATE = app TARGET = tst_language +DESTDIR = $$OUT_PWD DEPENDPATH += . INCLUDEPATH += . ../../../src/lib/ DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/tools/tools.pro b/tests/auto/tools/tools.pro index c5d5e9797..531360fdc 100644 --- a/tests/auto/tools/tools.pro +++ b/tests/auto/tools/tools.pro @@ -1,5 +1,6 @@ TEMPLATE = app TARGET = tst_tools +DESTDIR = $$OUT_PWD DEPENDPATH += . INCLUDEPATH += . ../../../src/lib/ DEFINES += SRCDIR=\\\"$$PWD/\\\" |