diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri
index b1c924dab6d36be7ab4b4c520f0abed64300e2bb..e2c8f654095841f73568bf162627cd15c1767d3e 100644
--- a/src/libs/3rdparty/botan/botan.pri
+++ b/src/libs/3rdparty/botan/botan.pri
@@ -1,2 +1,2 @@
 INCLUDEPATH *= $$PWD/build
-LIBS *= -l$$qtLibraryTarget(Botan)
+LIBS *= -l$$qtLibraryName(Botan)
diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri
index 50a03111e98361830d15b080d73a9e95388c1d0b..07e688609c85e2795baef1bb0a64bc9649681e80 100644
--- a/src/libs/cplusplus/cplusplus.pri
+++ b/src/libs/cplusplus/cplusplus.pri
@@ -1,3 +1,3 @@
 INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
 DEPENDPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
-LIBS *= -l$$qtLibraryTarget(CPlusPlus)
+LIBS *= -l$$qtLibraryName(CPlusPlus)
diff --git a/src/libs/qmljs/qmljs.pri b/src/libs/qmljs/qmljs.pri
index 3e78a74a35654285c1df79d3c073a0472b701eec..af334ef81f3e46ac3b81bdae633df852450f5d4b 100644
--- a/src/libs/qmljs/qmljs.pri
+++ b/src/libs/qmljs/qmljs.pri
@@ -2,5 +2,5 @@ INCLUDEPATH += $$PWD/../../shared
 INCLUDEPATH += $$PWD/../../shared/qmljs $$PWD/../../shared/qmljs/parser
 
 DEPENDPATH += $$PWD/../../shared/qmljs $$PWD/../../shared/qmljs/parser
-LIBS *= -l$$qtLibraryTarget(QmlJS)
+LIBS *= -l$$qtLibraryName(QmlJS)
 DEFINES += QT_CREATOR
diff --git a/src/libs/qtconcurrent/qtconcurrent.pri b/src/libs/qtconcurrent/qtconcurrent.pri
index 57929a4cf11042a08347064a1fb7cd4468efe858..141de8ee8e2ea2fb4f9ffe08e1277d71e066e83a 100644
--- a/src/libs/qtconcurrent/qtconcurrent.pri
+++ b/src/libs/qtconcurrent/qtconcurrent.pri
@@ -1 +1 @@
-LIBS *= -l$$qtLibraryTarget(QtConcurrent)
+LIBS *= -l$$qtLibraryName(QtConcurrent)
diff --git a/src/libs/symbianutils/symbianutils.pri b/src/libs/symbianutils/symbianutils.pri
index 6d3b9b3122824f24504e554527b490fc943680b2..c90d4da432bf95995935ead895711259cc9e04fc 100644
--- a/src/libs/symbianutils/symbianutils.pri
+++ b/src/libs/symbianutils/symbianutils.pri
@@ -1,3 +1,3 @@
 INCLUDEPATH *= $$PWD/../../shared/symbianutils
 DEPENDPATH += $$PWD/../../shared/symbianutils
-LIBS *= -l$$qtLibraryTarget(symbianutils)
+LIBS *= -l$$qtLibraryName(symbianutils)
diff --git a/src/plugins/coreplugin/coreplugin.pri b/src/plugins/coreplugin/coreplugin.pri
index fc5fc7aae611e7be950f9f2fc306c48149659381..26143cbc129b0ad08cd44ff9e44a4b5e4e175984 100644
--- a/src/plugins/coreplugin/coreplugin.pri
+++ b/src/plugins/coreplugin/coreplugin.pri
@@ -1,2 +1,2 @@
 include(coreplugin_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(Core)
+LIBS *= -l$$qtLibraryName(Core)
diff --git a/src/plugins/cppeditor/cppeditor.pri b/src/plugins/cppeditor/cppeditor.pri
index c4d6fdf753e9e6b39c1745df757266af79cabbb6..e3f320ef004a22c2d776b33f84002e2ed3174c50 100644
--- a/src/plugins/cppeditor/cppeditor.pri
+++ b/src/plugins/cppeditor/cppeditor.pri
@@ -1,3 +1,3 @@
 include(cppeditor_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(CppEditor)
+LIBS *= -l$$qtLibraryName(CppEditor)
diff --git a/src/plugins/cpptools/cpptools.pri b/src/plugins/cpptools/cpptools.pri
index 1dffbfc556010204b52d243b352a66946cf8754a..5732e896e7049803dfc46038c2870db3ecf7462f 100644
--- a/src/plugins/cpptools/cpptools.pri
+++ b/src/plugins/cpptools/cpptools.pri
@@ -1,3 +1,3 @@
 include(cpptools_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(CppTools)
+LIBS *= -l$$qtLibraryName(CppTools)
diff --git a/src/plugins/debugger/debugger.pri b/src/plugins/debugger/debugger.pri
index 52045952fdcc5793f32980e47bdfa29f3efaff08..d2df959e568ee19deacc00d00ecd2dff51856516 100644
--- a/src/plugins/debugger/debugger.pri
+++ b/src/plugins/debugger/debugger.pri
@@ -2,4 +2,4 @@ include(debugger_dependencies.pri)
 
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
-LIBS *= -l$$qtLibraryTarget(Debugger)
+LIBS *= -l$$qtLibraryName(Debugger)
diff --git a/src/plugins/designer/designer.pri b/src/plugins/designer/designer.pri
index d8af4897b388b64c9fbbd93b6a609678c9a4c9b9..829605d75e7e41db44abde37f71f242770ecbd33 100644
--- a/src/plugins/designer/designer.pri
+++ b/src/plugins/designer/designer.pri
@@ -1,3 +1,3 @@
 include(designer_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(Designer)
+LIBS *= -l$$qtLibraryName(Designer)
diff --git a/src/plugins/find/find.pri b/src/plugins/find/find.pri
index b28aec122f9c93dee976869c831e52bfb922989f..5ab55ec4342f08b55e0f3c80d8e4b8b3484729ce 100644
--- a/src/plugins/find/find.pri
+++ b/src/plugins/find/find.pri
@@ -1,3 +1,3 @@
 include(find_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(Find)
+LIBS *= -l$$qtLibraryName(Find)
diff --git a/src/plugins/locator/locator.pri b/src/plugins/locator/locator.pri
index 1eb758b80e6e82fae45ba74df969d7f74d6a67f2..541771da51439dc8b46c94e18c986d10e4f38f97 100644
--- a/src/plugins/locator/locator.pri
+++ b/src/plugins/locator/locator.pri
@@ -1,3 +1,3 @@
 include(locator_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(Locator)
+LIBS *= -l$$qtLibraryName(Locator)
diff --git a/src/plugins/projectexplorer/projectexplorer.pri b/src/plugins/projectexplorer/projectexplorer.pri
index fa0891a5fa2025d32af1377116a89188d827d8a4..8b464277e4e10981ce40d5357001e7d3aae907f1 100644
--- a/src/plugins/projectexplorer/projectexplorer.pri
+++ b/src/plugins/projectexplorer/projectexplorer.pri
@@ -1,2 +1,2 @@
 include(projectexplorer_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(ProjectExplorer)
+LIBS *= -l$$qtLibraryName(ProjectExplorer)
diff --git a/src/plugins/qmljseditor/qmljseditor.pri b/src/plugins/qmljseditor/qmljseditor.pri
index 3bf969a302e47f30480102f9bab139e538636e14..aac9022e3e5f30e2eb9a0aa9a927af4a0599e8cd 100644
--- a/src/plugins/qmljseditor/qmljseditor.pri
+++ b/src/plugins/qmljseditor/qmljseditor.pri
@@ -1,3 +1,3 @@
 include(qmljseditor_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(QmlJSEditor)
+LIBS *= -l$$qtLibraryName(QmlJSEditor)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pri b/src/plugins/qmlprojectmanager/qmlprojectmanager.pri
index fc1adf24f3e441ba4d3ad8a3bc2abcbdeb3917ee..948a5f9cc6485959939014f10a8b2919d68cd925 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pri
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pri
@@ -1,2 +1,2 @@
 include(qmlprojectmanager_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(QmlProjectManager)
+LIBS *= -l$$qtLibraryName(QmlProjectManager)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pri b/src/plugins/qt4projectmanager/qt4projectmanager.pri
index 34db66a9c4d1790c30cc5d86c48aa519dad26427..d3f03488b5f919ed29c362160c464f444024ac15 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pri
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pri
@@ -1,3 +1,3 @@
 include(qt4projectmanager_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(Qt4ProjectManager)
+LIBS *= -l$$qtLibraryName(Qt4ProjectManager)
diff --git a/src/plugins/texteditor/texteditor.pri b/src/plugins/texteditor/texteditor.pri
index 9d3789b82539d11e869bdb890e2af9d9f93f3d0f..c1c3e7a19ae4a06d05ceb3e250c5e60ac1b11356 100644
--- a/src/plugins/texteditor/texteditor.pri
+++ b/src/plugins/texteditor/texteditor.pri
@@ -1,3 +1,3 @@
 include(texteditor_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(TextEditor)
+LIBS *= -l$$qtLibraryName(TextEditor)
diff --git a/src/plugins/vcsbase/vcsbase.pri b/src/plugins/vcsbase/vcsbase.pri
index 56f7418c6664ad618f5ebf194ad04e4715f46e29..7ac74218c8e0f5c1571a25b55c4175556827a669 100644
--- a/src/plugins/vcsbase/vcsbase.pri
+++ b/src/plugins/vcsbase/vcsbase.pri
@@ -1,3 +1,3 @@
 include(vcsbase_dependencies.pri)
 
-LIBS *= -l$$qtLibraryTarget(VCSBase)
+LIBS *= -l$$qtLibraryName(VCSBase)
diff --git a/src/qtcreatorlibrary.pri b/src/qtcreatorlibrary.pri
index 35f2af4f24a98c7ec44501391369134e058b0af1..9b35abb390aef515168018886a69d836fc949431 100644
--- a/src/qtcreatorlibrary.pri
+++ b/src/qtcreatorlibrary.pri
@@ -11,7 +11,7 @@ DESTDIR = $$IDE_LIBRARY_PATH
 
 include(rpath.pri)
 
-TARGET = $$qtLibraryTarget($$TARGET)
+TARGET = $$qtLibraryName($$TARGET)
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index f18f4f5b9cacb4cc5704c696ceec8fdb406aff3f..a13d519dc804091e7693d016b28c5965f834e085 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -51,5 +51,5 @@ CONFIG += plugin plugin_with_soname
     INSTALLS += target pluginspec
 }
 
-TARGET = $$qtLibraryTarget($$TARGET)
+TARGET = $$qtLibraryName($$TARGET)
 
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index 2fb98dc31d9f51431aaa34e7ef7086642419bccd..fbef984bd69193b888336c41c2c8a0eea87411f9 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -4,4 +4,4 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
 include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
 include($$IDE_SOURCE_TREE/src/rpath.pri)
 LIBS += -L$$IDE_PLUGIN_PATH/Nokia
-DEFINES += Q_PLUGIN_PATH=\\\"$$IDE_PLUGIN_PATH/Nokia\\\"
+DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/Nokia\\\"\"
diff --git a/tests/manual/ccdb/ccdb.pro b/tests/manual/ccdb/ccdb.pro
index 6021878be3e2b5ef48b931166e79332a8f3b5eb8..13675b63d409888844731e254c5ab257451aaacb 100644
--- a/tests/manual/ccdb/ccdb.pro
+++ b/tests/manual/ccdb/ccdb.pro
@@ -15,7 +15,7 @@ INCLUDEPATH *= $$CDB_CORE
 # -- Add creator 'utils' lib
 CREATOR_LIB_LIB = ../../../lib/qtcreator
 LIBS *= -L$$CREATOR_LIB_LIB
-LIBS *= -l$$qtLibraryTarget(Utilsd)
+LIBS *= -l$$qtLibraryName(Utils)
 CREATOR_LIB_SRC = ../../../src/libs
 INCLUDEPATH *= $$CREATOR_LIB_SRC
 
diff --git a/tests/manual/process/process.pro b/tests/manual/process/process.pro
index 05c5e4a48c24f75a526d84ab32766939ba7494f5..02094ebfab8d3b4785c15a49f8cca3dac1e26661 100644
--- a/tests/manual/process/process.pro
+++ b/tests/manual/process/process.pro
@@ -8,13 +8,11 @@
 QT       += core
 QT       += gui
 
+include(../../../qtcreator.pri)
+
 # -- Add creator 'utils' lib
-CREATOR_LIB_LIB = ../../../lib/qtcreator
-LIBS *= -L$$CREATOR_LIB_LIB
-LIBS *= -l$$qtLibraryTarget(Utils)
-QMAKE_RPATHDIR*=$$CREATOR_LIB_LIB
-CREATOR_LIB_SRC = ../../../src/libs
-INCLUDEPATH *= $$CREATOR_LIB_SRC
+
+LIBS *= -l$$qtLibraryName(Utils)
 
 TARGET = process
 CONFIG   += console
diff --git a/tests/manual/ssh/ssh.pri b/tests/manual/ssh/ssh.pri
index cdbe6778b476133b966419ab30465391889191a3..ddf37d84e01b5f6ab30c2f31a3ca6e743f5257ff 100644
--- a/tests/manual/ssh/ssh.pri
+++ b/tests/manual/ssh/ssh.pri
@@ -1,14 +1,13 @@
-INCLUDEPATH += ../../../../src/plugins
-CREATORLIBPATH = ../../../../lib/qtcreator
-PLUGINPATH=$$CREATORLIBPATH/plugins/Nokia
-LIBS *= -L$$PLUGINPATH -lCore
-LIBS *= -L$$CREATORLIBPATH
 include (../../../qtcreator.pri)
-include (../../../src/plugins/coreplugin/coreplugin_dependencies.pri)
+include (../../../src/plugins/coreplugin/coreplugin.pri)
+
+INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins
+LIBS *= -L$$IDE_LIBRARY_PATH/Nokia
+
 QT       += core
 QT       -= gui
 CONFIG   += console
 CONFIG   -= app_bundle
 TEMPLATE = app
 DEPENDPATH+=.
-INCLUDEPATH+=.
\ No newline at end of file
+INCLUDEPATH+=.