diff options
| -rw-r--r-- | qtcreator.pri | 1 | ||||
| -rw-r--r-- | src/plugins/cpaster/frontend/frontend.pro | 3 | ||||
| -rw-r--r-- | src/tools/buildoutputparser/buildoutputparser.pro | 1 | ||||
| -rw-r--r-- | tests/auto/cplusplus/shared/shared.pri | 1 | ||||
| -rw-r--r-- | tests/auto/diff/differ/differ.pro | 2 | ||||
| -rw-r--r-- | tests/auto/externaltool/externaltool.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qrcparser/qrcparser.pro | 1 | ||||
| -rw-r--r-- | tests/auto/treeviewfind/treeviewfind.pro | 2 |
9 files changed, 3 insertions, 12 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 49ccc1e877..3e4a9490b3 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -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) { diff --git a/src/plugins/cpaster/frontend/frontend.pro b/src/plugins/cpaster/frontend/frontend.pro index 1c608d7e72..ea810e3a60 100644 --- a/src/plugins/cpaster/frontend/frontend.pro +++ b/src/plugins/cpaster/frontend/frontend.pro @@ -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 diff --git a/src/tools/buildoutputparser/buildoutputparser.pro b/src/tools/buildoutputparser/buildoutputparser.pro index 9d0b9f238a..4f762f2b02 100644 --- a/src/tools/buildoutputparser/buildoutputparser.pro +++ b/src/tools/buildoutputparser/buildoutputparser.pro @@ -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 diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri index 10b6f5cc13..579608c266 100644 --- a/tests/auto/cplusplus/shared/shared.pri +++ b/tests/auto/cplusplus/shared/shared.pri @@ -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\\\"\" diff --git a/tests/auto/diff/differ/differ.pro b/tests/auto/diff/differ/differ.pro index 98130952f0..ca73fd3dac 100644 --- a/tests/auto/diff/differ/differ.pro +++ b/tests/auto/diff/differ/differ.pro @@ -2,6 +2,4 @@ QTC_PLUGIN_DEPENDS += diffeditor include(../../qttest.pri) -LIBS *= -L$$IDE_PLUGIN_PATH - SOURCES += tst_differ.cpp diff --git a/tests/auto/externaltool/externaltool.pro b/tests/auto/externaltool/externaltool.pro index ea75e7ee88..a94191c544 100644 --- a/tests/auto/externaltool/externaltool.pro +++ b/tests/auto/externaltool/externaltool.pro @@ -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 diff --git a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro index 85a408ed89..fef95ed12d 100644 --- a/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro +++ b/tests/auto/qml/qmleditor/qmlcodeformatter/qmlcodeformatter.pro @@ -4,7 +4,5 @@ include(../../../qttest.pri) SRCDIR = $$IDE_SOURCE_TREE/src -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 56112dc3b2..571c0a11a3 100644 --- a/tests/auto/qml/qrcparser/qrcparser.pro +++ b/tests/auto/qml/qrcparser/qrcparser.pro @@ -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\\\" diff --git a/tests/auto/treeviewfind/treeviewfind.pro b/tests/auto/treeviewfind/treeviewfind.pro index 373e443a36..e1ac8caa02 100644 --- a/tests/auto/treeviewfind/treeviewfind.pro +++ b/tests/auto/treeviewfind/treeviewfind.pro @@ -1,7 +1,5 @@ QTC_PLUGIN_DEPENDS += coreplugin include(../qttest.pri) -LIBS *= -L$$IDE_PLUGIN_PATH - SOURCES += \ tst_treeviewfind.cpp |