Commit e9aaf215 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Centralize addition of plugin library paths

Change-Id: I9ddcc193b4d927c3d566eeb81c41f79a75920696
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@digia.com>
parent 6aad96d8
......@@ -217,6 +217,7 @@ qt:greaterThan(QT_MAJOR_VERSION, 4) {
QBSFILE = $$replace(_PRO_FILE_, \\.pro$, .qbs)
exists($$QBSFILE):OTHER_FILES += $$QBSFILE
!isEmpty(QTC_PLUGIN_DEPENDS):LIBS *= -L$$IDE_PLUGIN_PATH
# recursively resolve plugin deps
done_plugins =
for(ever) {
......
......@@ -4,6 +4,8 @@ TARGET=cpaster
QTC_LIB_DEPENDS += \
extensionsystem \
utils
QTC_PLUGIN_DEPENDS += \
coreplugin
include(../../../../qtcreator.pri)
include(../../../rpath.pri)
......@@ -12,7 +14,6 @@ CONFIG += console
CONFIG -= app_bundle
QT += network
LIBS *= -L$$IDE_PLUGIN_PATH -l$$qtLibraryName(Core)
QMAKE_RPATHDIR *= $$IDE_PLUGIN_PATH
DESTDIR=$$IDE_LIBEXEC_PATH
......
......@@ -10,7 +10,6 @@ CONFIG -= app_bundle
include(../../../qtcreator.pri)
include(../../rpath.pri)
LIBS += -L$$IDE_PLUGIN_PATH
win32|equals(TEST, 1):DEFINES += HAS_MSVC_PARSER
DESTDIR = $$IDE_BIN_PATH
......
......@@ -2,5 +2,4 @@ QTC_PLUGIN_DEPENDS += cpptools
include(../../qttest.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri)
LIBS *= -L$$IDE_PLUGIN_PATH
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\"
......@@ -2,6 +2,4 @@ QTC_PLUGIN_DEPENDS += diffeditor
include(../../qttest.pri)
LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += tst_differ.cpp
......@@ -3,8 +3,6 @@ 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
SOURCES += tst_externaltooltest.cpp \
$$IDE_SOURCE_TREE/src/plugins/coreplugin/externaltool.cpp
HEADERS += $$IDE_SOURCE_TREE/src/plugins/coreplugin/externaltool.h
......@@ -4,7 +4,5 @@ include(../../../qttest.pri)
SRCDIR = $$IDE_SOURCE_TREE/src
LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += \
tst_qmlcodeformatter.cpp
......@@ -4,7 +4,6 @@ include(../../qttest.pri)
#DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB
include($$IDE_SOURCE_TREE/src/rpath.pri)
LIBS *= -L$$IDE_PLUGIN_PATH
#DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\"
DEFINES += TESTSRCDIR=\\\"$$PWD\\\"
......
QTC_PLUGIN_DEPENDS += coreplugin
include(../qttest.pri)
LIBS *= -L$$IDE_PLUGIN_PATH
SOURCES += \
tst_treeviewfind.cpp
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment