diff --git a/qbs/imports/QtcAutotest.qbs b/qbs/imports/QtcAutotest.qbs
index 6606db7521b560b21fb7427733d4644e1188b4a1..2320c859aed7946641ee5e0a65161d562d293032 100644
--- a/qbs/imports/QtcAutotest.qbs
+++ b/qbs/imports/QtcAutotest.qbs
@@ -16,7 +16,7 @@ CppApplication {
cpp.rpaths: [
buildDirectory + '/' + project.ide_library_path,
buildDirectory + '/' + project.ide_library_path + "/..", // OSX
- buildDirectory + '/' + project.ide_plugin_path + "/QtProject"
+ buildDirectory + '/' + project.ide_plugin_path
]
// The following would be conceptually right, but does not work currently as some autotests
@@ -25,7 +25,7 @@ CppApplication {
// cpp.rpaths: qbs.targetOS.contains("osx")
// ? ["@executable_path/.."]
// : ["$ORIGIN/../" + project.libDirName + "/qtcreator",
-// "$ORIGIN/../" project.libDirName + "/qtcreator/plugins/QtProject"]
+// "$ORIGIN/../" project.libDirName + "/qtcreator/plugins"]
// Group {
// fileTagsFilter: product.type
// qbs.install: true
diff --git a/qbs/imports/QtcPlugin.qbs b/qbs/imports/QtcPlugin.qbs
index 638891e50150332f29190f00def56f7e57e1d881..3d0d7471a44cd646e6146247d64b59ab5a0b2181 100644
--- a/qbs/imports/QtcPlugin.qbs
+++ b/qbs/imports/QtcPlugin.qbs
@@ -4,7 +4,6 @@ import QtcFunctions
Product {
type: ["dynamiclibrary", "pluginSpec"]
- property string provider: 'QtProject'
property var pluginspecreplacements
property var pluginRecommends: []
@@ -13,7 +12,7 @@ Product {
condition: QtcFunctions.versionIsAtLeast(Qt.core.version, minimumQtVersion)
targetName: QtcFunctions.qtLibraryName(qbs, name)
- destinationDirectory: project.ide_plugin_path + '/' + provider
+ destinationDirectory: project.ide_plugin_path
Depends { name: "ExtensionSystem" }
Depends { name: "pluginspec" }
@@ -24,9 +23,9 @@ Product {
}
cpp.defines: project.generalDefines.concat([name.toUpperCase() + "_LIBRARY"])
- cpp.installNamePrefix: "@rpath/PlugIns/" + provider + "/"
- cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/../..", "@executable_path/.."]
- : ["$ORIGIN", "$ORIGIN/..", "$ORIGIN/../.."]
+ cpp.installNamePrefix: "@rpath/PlugIns/"
+ cpp.rpaths: qbs.targetOS.contains("osx") ? ["@loader_path/..", "@executable_path/.."]
+ : ["$ORIGIN", "$ORIGIN/.."]
cpp.cxxFlags: QtcFunctions.commonCxxFlags(qbs)
cpp.linkerFlags: {
var flags = QtcFunctions.commonLinkerFlags(qbs);
@@ -56,7 +55,7 @@ Product {
Group {
fileTagsFilter: product.type
qbs.install: true
- qbs.installDir: project.ide_plugin_path + "/" + provider
+ qbs.installDir: project.ide_plugin_path
}
Export {
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
index 8663c6f02c734c2d0a913c39828531b4a93c7661..16441a6024436982e100096513b60c301a3cd355 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
@@ -26,8 +26,6 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=%QtCreatorBuild%
## "~/Library/Application Support/QtProject/Qt Creator" on Mac
%DestDir%USE_USER_DESTDIR = yes
-PROVIDER = %VendorName%
-
###### If the plugin can be depended upon by other plugins, this code needs to be outsourced to
###### <dirname>_dependencies.pri, where <dirname> is the name of the directory containing the
###### plugin's sources.
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
index 4feae8c564c95826104be99d9d2072eca476905b..6cd7856448e320199321dfd662791cd6482195dd 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
@@ -1,5 +1,3 @@
-#PROVIDER = Openismus
-
include(../../qtcreatorplugin.pri)
HEADERS = autotoolsprojectplugin.h\
diff --git a/src/plugins/baremetal/baremetal.pro b/src/plugins/baremetal/baremetal.pro
index 421ad0d69ce26473fee32da0d2438840ddadd3c7..e877b934a125b087171b2e696b101b76cc92c863 100644
--- a/src/plugins/baremetal/baremetal.pro
+++ b/src/plugins/baremetal/baremetal.pro
@@ -1,5 +1,4 @@
QT += network
-PROVIDER = Sander
include(../../qtcreatorplugin.pri)
# BareMetal files
diff --git a/src/plugins/baremetal/baremetal.qbs b/src/plugins/baremetal/baremetal.qbs
index 53d221cca28386a8808c8ca9dd48a5e664491c0f..5571c745f636002a4bdc825800b78d3ed4354de1 100644
--- a/src/plugins/baremetal/baremetal.qbs
+++ b/src/plugins/baremetal/baremetal.qbs
@@ -4,7 +4,6 @@ import QtcPlugin
QtcPlugin {
name: "BareMetal"
- provider: "Sander"
Depends { name: "Qt"; submodules: ["network", "widgets"]; }
Depends { name: "QtcSsh" }
diff --git a/src/plugins/clearcase/clearcase.pro b/src/plugins/clearcase/clearcase.pro
index 21afe71021f0a8fea60f0a3935eb89b28a4db592..83e9214f6ccf13e07dccbb4c09172dea7777fb07 100644
--- a/src/plugins/clearcase/clearcase.pro
+++ b/src/plugins/clearcase/clearcase.pro
@@ -1,5 +1,3 @@
-# PROVIDER = AudioCodes
-
macx: CLEARCASE_DISABLED_STR = "true"
else: CLEARCASE_DISABLED_STR = "false"
diff --git a/src/plugins/clearcase/clearcase.qbs b/src/plugins/clearcase/clearcase.qbs
index 8321bbb53b3cb6c123c718c218aa1594916b3716..9081032607823d97bcf60f275bd4496ac5c5500a 100644
--- a/src/plugins/clearcase/clearcase.qbs
+++ b/src/plugins/clearcase/clearcase.qbs
@@ -4,7 +4,6 @@ import QtcPlugin
QtcPlugin {
name: "ClearCase"
-// provider: "AudioCodes"
pluginspecreplacements: ({"CLEARCASE_DISABLED_STR": (qbs.targetOS.contains("osx") ? "true": "false")})
diff --git a/src/plugins/cpaster/frontend/frontend.pro b/src/plugins/cpaster/frontend/frontend.pro
index 8888cacdf94cd440cb8fb7e004b8bb30c3c0e806..1c608d7e72d3d106abd0f82711b3c5650c09060b 100644
--- a/src/plugins/cpaster/frontend/frontend.pro
+++ b/src/plugins/cpaster/frontend/frontend.pro
@@ -12,8 +12,8 @@ CONFIG += console
CONFIG -= app_bundle
QT += network
-LIBS *= -L$$IDE_PLUGIN_PATH/QtProject -l$$qtLibraryName(Core)
-QMAKE_RPATHDIR *= $$IDE_PLUGIN_PATH/QtProject
+LIBS *= -L$$IDE_PLUGIN_PATH -l$$qtLibraryName(Core)
+QMAKE_RPATHDIR *= $$IDE_PLUGIN_PATH
DESTDIR=$$IDE_LIBEXEC_PATH
diff --git a/src/plugins/cpaster/frontend/frontend.qbs b/src/plugins/cpaster/frontend/frontend.qbs
index d8619be38026eea30c7370d6f6d2dae1ae4783f1..6c9ac521389cc29f1253c1102e05be332de6f37d 100644
--- a/src/plugins/cpaster/frontend/frontend.qbs
+++ b/src/plugins/cpaster/frontend/frontend.qbs
@@ -14,7 +14,6 @@ QtcTool {
cpp.rpaths: [
"$ORIGIN/../" + project.libDirName + "/qtcreator",
"$ORIGIN/../" + project.libDirName + "/qtcreator/plugins",
- "$ORIGIN/../" + project.libDirName + "/qtcreator/plugins/QtProject"
]
Group {
diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro
index c6e9fba78304aba1bea5a8915f4068b765d08773..e484cb38fca429c575302e2c78ebf6bad2572f63 100644
--- a/src/plugins/qnx/qnx.pro
+++ b/src/plugins/qnx/qnx.pro
@@ -1,5 +1,4 @@
QT += network xml
-PROVIDER = BlackBerry
include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/qnx/qnx.qbs b/src/plugins/qnx/qnx.qbs
index 29ab573e9d69a8a04dea276f221dfeb01706b328..0159a1cad71b6615509c1eb7c3cbd0d6b813dddf 100644
--- a/src/plugins/qnx/qnx.qbs
+++ b/src/plugins/qnx/qnx.qbs
@@ -4,7 +4,6 @@ import QtcPlugin
QtcPlugin {
name: "Qnx"
- provider: "BlackBerry"
Depends { name: "Qt"; submodules: ["widgets", "xml", "network"] }
Depends { name: "QtcSsh" }
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index b90b9b9b83f9429aee1eaf8e9c01acaa7e92380a..0fe283d2e83996d2a2ce38ff3f7a53bee6064efe 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -48,14 +48,8 @@ dependencyList = $$join(dependencyList, $$escape_expand(\\n))
# use gui precompiled header for plugins by default
isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/qtcreator_gui_pch.h
-isEmpty(PROVIDER) {
- PROVIDER = QtProject
-} else {
- LIBS += -L$$IDE_PLUGIN_PATH/QtProject
-}
-
isEmpty(USE_USER_DESTDIR) {
- DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER
+ DESTDIR = $$IDE_PLUGIN_PATH
} else {
win32 {
DESTDIRAPPNAME = "qtcreator"
@@ -70,7 +64,7 @@ isEmpty(USE_USER_DESTDIR) {
isEmpty(DESTDIRBASE):DESTDIRBASE = "$$(HOME)/.local/share/data"
else:DESTDIRBASE = "$$DESTDIRBASE/data"
}
- DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION/$$PROVIDER"
+ DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION"
}
LIBS += -L$$DESTDIR
@@ -130,13 +124,12 @@ greaterThan(QT_MAJOR_VERSION, 4) {
}
macx {
- QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/$${PROVIDER}/
- QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../
+ QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/
+ QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../
} else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
QMAKE_RPATHDIR += \$\$ORIGIN
QMAKE_RPATHDIR += \$\$ORIGIN/..
- QMAKE_RPATHDIR += \$\$ORIGIN/../..
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
QMAKE_RPATHDIR =
@@ -149,9 +142,9 @@ CONFIG += plugin plugin_with_soname
linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
!macx {
- target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
+ target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins
pluginspec.files += $${TARGET}.pluginspec
- pluginspec.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
+ pluginspec.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins
INSTALLS += target pluginspec
}
diff --git a/src/tools/buildoutputparser/buildoutputparser.pro b/src/tools/buildoutputparser/buildoutputparser.pro
index 5b9aa4ea240da8f2fd324c2463d7c49815f56068..9d0b9f238a040b8f3d85bf63a1218dbe3266a014 100644
--- a/src/tools/buildoutputparser/buildoutputparser.pro
+++ b/src/tools/buildoutputparser/buildoutputparser.pro
@@ -10,7 +10,7 @@ CONFIG -= app_bundle
include(../../../qtcreator.pri)
include(../../rpath.pri)
-LIBS += -L$$IDE_PLUGIN_PATH/QtProject
+LIBS += -L$$IDE_PLUGIN_PATH
win32|equals(TEST, 1):DEFINES += HAS_MSVC_PARSER
DESTDIR = $$IDE_BIN_PATH
diff --git a/src/tools/buildoutputparser/buildoutputparser.qbs b/src/tools/buildoutputparser/buildoutputparser.qbs
index f1fbd8f7952bfef6168bae12782a86cbe49b176c..ef7727b1e6d30a6d0f77415de866baab986f114d 100644
--- a/src/tools/buildoutputparser/buildoutputparser.qbs
+++ b/src/tools/buildoutputparser/buildoutputparser.qbs
@@ -14,7 +14,7 @@ QtcTool {
]
cpp.rpaths: base.concat(qbs.targetOS.contains("osx")
? ["@executable_path/../"]
- : ["$ORIGIN/../" + project.ide_plugin_path + "/QtProject"])
+ : ["$ORIGIN/../" + project.ide_plugin_path])
cpp.defines: base.concat(qbs.targetOS.contains("windows") || project.testsEnabled
? ["HAS_MSVC_PARSER"] : [])
}
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index ec17872a9fb5577b8adee29597496a36de1127b4..10b6f5cc135966b0e6a083f9d4ef4d269199e662 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -2,5 +2,5 @@ QTC_PLUGIN_DEPENDS += cpptools
include(../../qttest.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri)
-LIBS += -L$$IDE_PLUGIN_PATH/QtProject
-DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/QtProject\\\"\"
+LIBS *= -L$$IDE_PLUGIN_PATH
+DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\"
diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 2b23755c4c07aae85b7a88a16798116fd378e906..80e02f4a37c0d1d8c3d556cb830bd896caf1b671 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/tests/auto/debugger/dumpers.pro
@@ -7,8 +7,8 @@ win32-msvc* {
include(../qttest.pri)
win32-msvc* {
- LIBS += -L$$IDE_PLUGIN_PATH/QtProject
- DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/QtProject\\\"\"
+ LIBS *= -L$$IDE_PLUGIN_PATH
+ DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\"
CDBEXT_PATH = $$IDE_BUILD_TREE\\$$IDE_LIBRARY_BASENAME
# replace '\' with '\\'
diff --git a/tests/auto/diff/differ/differ.pro b/tests/auto/diff/differ/differ.pro
index 9f00b4076c23319478f038dba1c19cceab815ddc..98130952f0d20f5a058720bb5cfd8de7b1567ffe 100644
--- a/tests/auto/diff/differ/differ.pro
+++ b/tests/auto/diff/differ/differ.pro
@@ -2,6 +2,6 @@ QTC_PLUGIN_DEPENDS += diffeditor
include(../../qttest.pri)
-LIBS += -L$$IDE_PLUGIN_PATH/QtProject
+LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += tst_differ.cpp
diff --git a/tests/auto/extensionsystem/plugin.qbs b/tests/auto/extensionsystem/plugin.qbs
index c6ccbe756692aa71c497c772f2fe2a81ae0548af..f7b99b7f7c6783b6344ab4ffb56a58d3be88869b 100644
--- a/tests/auto/extensionsystem/plugin.qbs
+++ b/tests/auto/extensionsystem/plugin.qbs
@@ -12,7 +12,7 @@ DynamicLibrary {
destinationDirectory: FileInfo.relativePath(project.ide_source_tree, sourceDirectory)
cpp.rpaths: [
buildDirectory + "/" + project.libDirName + "/qtcreator",
- buildDirectory + "/" + project.libDirName + "/qtcreator/plugins/QtProject"
+ buildDirectory + "/" + project.libDirName + "/qtcreator/plugins"
].concat(additionalRPaths)
property pathList filesToCopy
property pathList additionalRPaths: []
diff --git a/tests/auto/externaltool/externaltool.pro b/tests/auto/externaltool/externaltool.pro
index bc16a794f310e3df71fbe5d782f59c5c85f10a2f..ea75e7ee8806177db3c70ebaa478c64fcb02695e 100644
--- a/tests/auto/externaltool/externaltool.pro
+++ b/tests/auto/externaltool/externaltool.pro
@@ -3,7 +3,7 @@ include(../qttest.pri)
include($$IDE_SOURCE_TREE/src/plugins/coreplugin/coreplugin_dependencies.pri)
include($$IDE_SOURCE_TREE/src/libs/utils/utils_dependencies.pri)
-LIBS *= -L$$IDE_PLUGIN_PATH/QtProject
+LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += tst_externaltooltest.cpp \
$$IDE_SOURCE_TREE/src/plugins/coreplugin/externaltool.cpp
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index ca31ee4439efe6020bab202ce80bf79aa702495d..bd2f0f21687d53cde730981fa3a03b58483e794a 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -6,10 +6,10 @@ OUT_PWD=IDE_BUILD_TREE
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
include(../../../qttest.pri)
OUT_PWD=$$OUT_PWD_SAVE
-LIBS += -L$$IDE_PLUGIN_PATH/QtProject
-LIBS += -L$$IDE_LIBRARY_PATH
+LIBS *= -L$$IDE_PLUGIN_PATH
+LIBS *= -L$$IDE_LIBRARY_PATH
-unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}/QtProject\'
+unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}\'
QT += script \
network
diff --git a/tests/auto/qml/qmldesigner/coretests/setupPath.bat b/tests/auto/qml/qmldesigner/coretests/setupPath.bat
index 7355f3c099446bf451314db21c05a19c7bfe72b3..d04a9812dd8f9839776c7305fb129ac15f740866 100644
--- a/tests/auto/qml/qmldesigner/coretests/setupPath.bat
+++ b/tests/auto/qml/qmldesigner/coretests/setupPath.bat
@@ -1 +1 @@
-@set path=%PATH%;%CD%\..\..\..\..\..\lib\qtcreator\plugins\QtProject\
+@set path=%PATH%;%CD%\..\..\..\..\..\lib\qtcreator\plugins\
diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro
index 5f718690f5a54fed396f3a6c14dd50a0b64cdf33..85a408ed89208073bb103d2341e10aa92b4be410 100644
--- a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro
+++ b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro
@@ -4,7 +4,7 @@ include(../../../qttest.pri)
SRCDIR = $$IDE_SOURCE_TREE/src
-LIBS += -L$$IDE_PLUGIN_PATH/QtProject
+LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += \
tst_qmlcodeformatter.cpp
diff --git a/tests/auto/qml/qrcparser/qrcparser.pro b/tests/auto/qml/qrcparser/qrcparser.pro
index a051c8926c803c7e35a70ec8f1f0b4487cfd32ab..56112dc3b28fb117b26babb5a9e81f76be0ae9eb 100644
--- a/tests/auto/qml/qrcparser/qrcparser.pro
+++ b/tests/auto/qml/qrcparser/qrcparser.pro
@@ -4,8 +4,8 @@ include(../../qttest.pri)
#DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
include($$IDE_SOURCE_TREE/src/rpath.pri)
-LIBS += -L$$IDE_PLUGIN_PATH/QtProject
-#DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/QtProject\\\"\"
+LIBS *= -L$$IDE_PLUGIN_PATH
+#DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\"
DEFINES += TESTSRCDIR=\\\"$$PWD\\\"
SOURCES += $$PWD/tst_qrcparser.cpp
diff --git a/tests/auto/qttest.pri b/tests/auto/qttest.pri
index 83a24b73e18e98c13dcc015e3a90c1f4d38702fb..20f6e635e4aa2a7283a38d5f0f7341f290df11ea 100644
--- a/tests/auto/qttest.pri
+++ b/tests/auto/qttest.pri
@@ -11,7 +11,7 @@ DEFINES -= QT_NO_CAST_FROM_ASCII
!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
win32 {
- lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH/QtProject
+ lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH
lib ~= s,/,\\,g
# the below gets added to later by testcase.prf
check.commands = cd . & set PATH=$$lib;%PATH%& cmd /c
diff --git a/tests/auto/qttestrpath.pri b/tests/auto/qttestrpath.pri
index b29ed86e4a3027be2c745dda3307f2fd4b871de3..bd65a2f3ef6578837ef24adcf55ad458cd98f192 100644
--- a/tests/auto/qttestrpath.pri
+++ b/tests/auto/qttestrpath.pri
@@ -1,6 +1,6 @@
linux-* {
QMAKE_RPATHDIR += $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
- QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH/QtProject
+ QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
diff --git a/tests/auto/treeviewfind/treeviewfind.pro b/tests/auto/treeviewfind/treeviewfind.pro
index 3d1b058d6ca2268b352993f3fdfa5b5a0dded822..373e443a365e3c325e77425aa1dc5597c7f861ff 100644
--- a/tests/auto/treeviewfind/treeviewfind.pro
+++ b/tests/auto/treeviewfind/treeviewfind.pro
@@ -1,7 +1,7 @@
QTC_PLUGIN_DEPENDS += coreplugin
include(../qttest.pri)
-LIBS *= -L$$IDE_PLUGIN_PATH/QtProject
+LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += \
tst_treeviewfind.cpp
diff --git a/tests/auto/valgrind/README b/tests/auto/valgrind/README
index daac03a3d52af70081a7c8ae22e7aab629f29858..60c1dca11e449858ae29b9a5cfd85ee4714eebd0 100644
--- a/tests/auto/valgrind/README
+++ b/tests/auto/valgrind/README
@@ -8,7 +8,7 @@ mkdir valgrind-test
cd valgrind-test
# make library paths known to ldconfig
-export LD_LIBRARY_PATH=/path/to/qtc-build/lib/qtcreator:/path/to/qtc-build/lib/qtcreator/plugins/QtProject
+export LD_LIBRARY_PATH=/path/to/qtc-build/lib/qtcreator:/path/to/qtc-build/lib/qtcreator/plugins
# run qmake, make
qmake CONFIG+=debug IDE_BUILD_TREE=$(readlink -f ..) ../../path/to/qtc/tests/auto/valgrind
diff --git a/tests/auto/valgrind/callgrind/modeltest.pro b/tests/auto/valgrind/callgrind/modeltest.pro
index 9ad6548669eb69eaad57409eb80f1c8e4768922e..647043c513b033764c1fb5bcbf62901cd8382d3d 100644
--- a/tests/auto/valgrind/callgrind/modeltest.pro
+++ b/tests/auto/valgrind/callgrind/modeltest.pro
@@ -29,7 +29,7 @@ HEADERS += \
$$SRCDIR/plugins/valgrind/callgrindwidgethandler.h \
$$SRCDIR/plugins/valgrind/callgrindvisualisation.h \
-LIBS += -L$$IDE_PLUGIN_PATH/QtProject
+LIBS *= -L$$IDE_PLUGIN_PATH
INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin # for ide_version.h
diff --git a/tests/manual/debugger/simple/simple_test_plugin.pro b/tests/manual/debugger/simple/simple_test_plugin.pro
index 79f68a60c6ba4c9f8d0fc0684db9568eedd67801..fc2539f40f8f76e503f7d406b4ff1ed3b727a34e 100644
--- a/tests/manual/debugger/simple/simple_test_plugin.pro
+++ b/tests/manual/debugger/simple/simple_test_plugin.pro
@@ -5,7 +5,7 @@ CONFIG += shared
SOURCES += simple_test_plugin.cpp
macx {
- QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/
+ QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/
} else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
QMAKE_RPATHDIR += \$\$ORIGIN/..