diff --git a/qbs/imports/QtcManualtest.qbs b/qbs/imports/QtcManualtest.qbs index cc21c8e3fa6..cfa1abc1d8f 100644 --- a/qbs/imports/QtcManualtest.qbs +++ b/qbs/imports/QtcManualtest.qbs @@ -17,5 +17,7 @@ QtcProduct { return defines; } + destinationDirectory: project.buildDirectory + '/' + + FileInfo.relativePath(project.ide_source_tree, sourceDirectory) install: false } diff --git a/tests/manual/pluginview/plugindialog.cpp b/tests/manual/pluginview/plugindialog.cpp index 9a0af5d449e..05e9bede88e 100644 --- a/tests/manual/pluginview/plugindialog.cpp +++ b/tests/manual/pluginview/plugindialog.cpp @@ -136,7 +136,7 @@ int main(int argc, char *argv[]) QObject::connect(&app, &QCoreApplication::aboutToQuit, &manager, &ExtensionSystem::PluginManager::shutdown); PluginDialog dialog; - manager.setPluginPaths(QStringList() << "plugins"); + manager.setPluginPaths(QStringList() << app.applicationDirPath() + "/plugins"); manager.loadPlugins(); dialog.show(); app.exec(); diff --git a/tests/manual/pluginview/plugins/plugin1/plugin1.qbs b/tests/manual/pluginview/plugins/plugin1/plugin1.qbs index 631d08088d3..e709f0208ae 100644 --- a/tests/manual/pluginview/plugins/plugin1/plugin1.qbs +++ b/tests/manual/pluginview/plugins/plugin1/plugin1.qbs @@ -1,7 +1,10 @@ +import qbs.FileInfo + QtcManualtest { name: "Manual test plugin1" targetName: "plugin1" type: [ "dynamiclibrary" ] + destinationDirectory: FileInfo.cleanPath(FileInfo.joinPaths(base , "..")) Depends { name: "ExtensionSystem" } Depends { name: "Manual test plugin2"} diff --git a/tests/manual/pluginview/plugins/plugin2/plugin2.qbs b/tests/manual/pluginview/plugins/plugin2/plugin2.qbs index f2cb5036f1b..4c97412990c 100644 --- a/tests/manual/pluginview/plugins/plugin2/plugin2.qbs +++ b/tests/manual/pluginview/plugins/plugin2/plugin2.qbs @@ -1,7 +1,10 @@ +import qbs.FileInfo + QtcManualtest { name: "Manual test plugin2" targetName: "plugin2" type: [ "dynamiclibrary" ] + destinationDirectory: FileInfo.cleanPath(FileInfo.joinPaths(base , "..")) Depends { name: "ExtensionSystem" } diff --git a/tests/manual/pluginview/plugins/plugin3/plugin3.qbs b/tests/manual/pluginview/plugins/plugin3/plugin3.qbs index 884b850c6f9..659fcda5063 100644 --- a/tests/manual/pluginview/plugins/plugin3/plugin3.qbs +++ b/tests/manual/pluginview/plugins/plugin3/plugin3.qbs @@ -1,7 +1,10 @@ +import qbs.FileInfo + QtcManualtest { name: "Manual test plugin3" targetName: "plugin3" type: [ "dynamiclibrary" ] + destinationDirectory: FileInfo.cleanPath(FileInfo.joinPaths(base , "..")) Depends { name: "ExtensionSystem" } Depends { name: "Manual test plugin2" }