diff --git a/tests/auto/sdktool/sdktool.pro b/tests/auto/sdktool/sdktool.pro index cc5fb2d28cc..d333b897287 100644 --- a/tests/auto/sdktool/sdktool.pro +++ b/tests/auto/sdktool/sdktool.pro @@ -1,3 +1,5 @@ include(../qttest.pri) +DEFINES += "SDKTOOL_DIR=\\\"$$IDE_LIBEXEC_PATH\\\"" + SOURCES += tst_sdktool.cpp diff --git a/tests/auto/sdktool/sdktool.qbs b/tests/auto/sdktool/sdktool.qbs index 1fd08fc2586..ca201b4b8e4 100644 --- a/tests/auto/sdktool/sdktool.qbs +++ b/tests/auto/sdktool/sdktool.qbs @@ -7,4 +7,6 @@ QtcAutotest { name: "Test sources" files: "tst_sdktool.cpp" } + + cpp.defines: base.concat(['SDKTOOL_DIR="' + qbs.installRoot + '/' + project.ide_libexec_path + '"']) } diff --git a/tests/auto/sdktool/tst_sdktool.cpp b/tests/auto/sdktool/tst_sdktool.cpp index 8cc01357d4c..c3a3fe9b8e4 100644 --- a/tests/auto/sdktool/tst_sdktool.cpp +++ b/tests/auto/sdktool/tst_sdktool.cpp @@ -43,11 +43,7 @@ private slots: void SdktoolTest::testSdktool() { - QDir rootDir = QCoreApplication::applicationDirPath(); - rootDir.cdUp(); - rootDir.cdUp(); - rootDir.cdUp(); - rootDir.cd(QLatin1String("bin")); + QDir rootDir(SDKTOOL_DIR); QProcess process; process.start(rootDir.absoluteFilePath(QLatin1String("sdktool")), QStringList() << QLatin1String("-test"));