diff --git a/src/plugins/bineditor/bineditor_dependencies.pri b/src/plugins/bineditor/bineditor_dependencies.pri index 30120bd3f510f26258aab8df2765bf662477b389..5ccafe00072b0e1bf9ffa45a80b771c124ea34c0 100644 --- a/src/plugins/bineditor/bineditor_dependencies.pri +++ b/src/plugins/bineditor/bineditor_dependencies.pri @@ -1,4 +1,4 @@ -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../libs/utils/utils.pri) include(../../plugins/texteditor/texteditor.pri) include(../../plugins/coreplugin/coreplugin.pri) diff --git a/src/plugins/bookmarks/bookmarks.pro b/src/plugins/bookmarks/bookmarks.pro index d061d5fa76dce072be0a2cf397f53565efd0dd04..9d3ca71865479f444e19c5f164b19bb56ad48b9d 100644 --- a/src/plugins/bookmarks/bookmarks.pro +++ b/src/plugins/bookmarks/bookmarks.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = Bookmarks -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/texteditor/texteditor.pri) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro index e2d02bba527d07e0c0ed6fa79115dc2ca38bfa95..c851b79fd1fde423f61386c243c1210b13389d85 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = CMakeProjectManager -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(cmakeprojectmanager_dependencies.pri) HEADERS = cmakeproject.h \ cmakeprojectplugin.h \ diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index 5efa111749e2e85d162c1fbe43d5fdd6f3f6d1a2..bda8d8d3ae1774fee790db0f03e600e01bdf1b41 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -4,7 +4,7 @@ DEFINES += CORE_LIBRARY QT += xml \ script \ svg -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../libs/utils/utils.pri) include(../../shared/scriptwrapper/scriptwrapper.pri) include(coreplugin_dependencies.pri) diff --git a/src/plugins/cpaster/cpaster.pro b/src/plugins/cpaster/cpaster.pro index d75a91de5a16da9099b68c3d18bd47d1f869e240..e12ba9845fe540d496059b1b659f5ad6dfe2c889 100644 --- a/src/plugins/cpaster/cpaster.pro +++ b/src/plugins/cpaster/cpaster.pro @@ -2,7 +2,7 @@ QT += network TEMPLATE = lib TARGET = CodePaster -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(cpaster_dependencies.pri) HEADERS += cpasterplugin.h \ diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index 64ee6631957b7fad38bde663305a48c8962e74f1..7f3a043ea03fc3a1273f98fde6e19be6d29e2cbc 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/src/plugins/cppeditor/cppeditor.pro @@ -4,7 +4,7 @@ DEFINES += CPPEDITOR_LIBRARY CONFIG += help include(../../libs/utils/utils.pri) include(../../shared/indenter/indenter.pri) -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(cppeditor_dependencies.pri) HEADERS += cppplugin.h \ cppeditor.h \ diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro index 5a5763f6af4f3ac43836dcfcd24bbcaa198823d9..d6d24e0f8389d8ebc5676f5f2dc63f80419f5bbc 100644 --- a/src/plugins/cpptools/cpptools.pro +++ b/src/plugins/cpptools/cpptools.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = CppTools -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/quickopen/quickopen.pri) include(cpptools_dependencies.pri) diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro index 8ee3b25f03810f829bf36e50f93f4998156dfe32..f708ba1b42ee7c670aceef61de96db1417243a85 100644 --- a/src/plugins/debugger/debugger.pro +++ b/src/plugins/debugger/debugger.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = Debugger # CONFIG += single -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/find/find.pri) include(../../plugins/coreplugin/coreplugin.pri) diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro index 7fc739875661192299614a88ad82d5995a0aeb9a..10957e9242a4519dfc7df64218187f45f4d1d80c 100644 --- a/src/plugins/designer/designer.pro +++ b/src/plugins/designer/designer.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = Designer -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../shared/designerintegrationv2/designerintegration.pri) include(cpp/cpp.pri) include(designer_dependencies.pri) diff --git a/src/plugins/fakevim/fakevim.pro b/src/plugins/fakevim/fakevim.pro index 890f047cfa46ba08d42f2995b9c91ed6621966f7..372077baa3e78755578ed388d42ae52ea7a6e701 100644 --- a/src/plugins/fakevim/fakevim.pro +++ b/src/plugins/fakevim/fakevim.pro @@ -3,7 +3,7 @@ TARGET = FakeVim # CONFIG += single include(../../libs/cplusplus/cplusplus.pri) -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/texteditor/texteditor.pri) diff --git a/src/plugins/find/find.pro b/src/plugins/find/find.pro index 52c93f3023361b4df44f756386573b40b19695be..bfdb979332a06cab9a1db6e9809b52d23b87c5a1 100644 --- a/src/plugins/find/find.pro +++ b/src/plugins/find/find.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = Find -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(find_dependencies.pri) DEFINES += FIND_LIBRARY HEADERS += findtoolwindow.h \ diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.pro b/src/plugins/genericprojectmanager/genericprojectmanager.pro index eb00ccc16e413afd36d0f436ec266a1ae323a4a1..a58404176a9c2a66c2eac82bf657cb0ec5001fa5 100644 --- a/src/plugins/genericprojectmanager/genericprojectmanager.pro +++ b/src/plugins/genericprojectmanager/genericprojectmanager.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = GenericProjectManager -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(genericprojectmanager_dependencies.pri) HEADERS = genericproject.h \ genericprojectplugin.h \ diff --git a/src/plugins/git/git.pro b/src/plugins/git/git.pro index c038852a2dc1bfc346afd649ec15d3c532bc1a1d..8b9a6171e8865d2c75e45903bd4248efe9b4ce5b 100644 --- a/src/plugins/git/git.pro +++ b/src/plugins/git/git.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = ScmGit -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/texteditor/texteditor.pri) include(../../plugins/coreplugin/coreplugin.pri) diff --git a/src/plugins/helloworld/helloworld.pro b/src/plugins/helloworld/helloworld.pro index 19be467b0f6ecda573ea0996d500f880f5622287..82313b6dd17e70c8118cb1e50cabc23c33f67a6d 100644 --- a/src/plugins/helloworld/helloworld.pro +++ b/src/plugins/helloworld/helloworld.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = HelloWorld -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/coreplugin/coreplugin.pri) HEADERS += helloworldplugin.h \ diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro index 750afe0e445a6253cd299884eacbee75b4d206f1..d2d64ccee86007c6dac952aa6441df876169d735 100644 --- a/src/plugins/help/help.pro +++ b/src/plugins/help/help.pro @@ -1,6 +1,6 @@ TEMPLATE = lib TARGET = Help -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/find/find.pri) include(../../plugins/quickopen/quickopen.pri) diff --git a/src/plugins/perforce/perforce.pro b/src/plugins/perforce/perforce.pro index e386aba34c17cb8000aeacfce7281c744848bc64..66fe1fe1f5a560be36a72313c254bbd7b67c9aa7 100644 --- a/src/plugins/perforce/perforce.pro +++ b/src/plugins/perforce/perforce.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = Perforce -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(perforce_dependencies.pri) HEADERS += p4.h \ diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro index 170a54387ea16f8408c1ff67247501469b770e84..a246d2d52e370ea54c708173f42ea234f6dd8e1c 100644 --- a/src/plugins/projectexplorer/projectexplorer.pro +++ b/src/plugins/projectexplorer/projectexplorer.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = ProjectExplorer QT += xml \ script -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(projectexplorer_dependencies.pri) include(../../shared/scriptwrapper/scriptwrapper.pri) include(../../libs/utils/utils.pri) diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro index c5e12b5efac5e2b7123ba7659c9a6b6c29b3dcb6..d58e2135f46b70d71e14629d5fbe2b5636005df7 100644 --- a/src/plugins/qt4projectmanager/qt4projectmanager.pro +++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = Qt4ProjectManager QT += network -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(qt4projectmanager_dependencies.pri) HEADERS = qt4projectmanagerplugin.h \ qt4projectmanager.h \ diff --git a/src/plugins/qtestlib/qtestlib.pro b/src/plugins/qtestlib/qtestlib.pro index 5031b1d6b479f15e01b7802f55b102eeb380e5a6..68dbecd57b23f081d16f68689306b242824741b4 100644 --- a/src/plugins/qtestlib/qtestlib.pro +++ b/src/plugins/qtestlib/qtestlib.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = QTestLibPlugin QT += xml -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/coreplugin/coreplugin.pri) SOURCES += qtestlibplugin.cpp diff --git a/src/plugins/qtscripteditor/qtscripteditor.pro b/src/plugins/qtscripteditor/qtscripteditor.pro index 357e52df93d0e71b3799e832c510362259499a71..7fd3ff19c6dbd23306e7620cbd57042ddb7d1846 100644 --- a/src/plugins/qtscripteditor/qtscripteditor.pro +++ b/src/plugins/qtscripteditor/qtscripteditor.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = QtScriptEditor QT += script -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/texteditor/texteditor.pri) include(../../shared/qscripthighlighter/qscripthighlighter.pri) diff --git a/src/plugins/quickopen/quickopen.pro b/src/plugins/quickopen/quickopen.pro index f5a7dd9ce01bcaf1a6878b8ef4f4705c95800f75..83b4cd58dd260638863bdfb0d4e9f4f1bd41a1b5 100644 --- a/src/plugins/quickopen/quickopen.pro +++ b/src/plugins/quickopen/quickopen.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = QuickOpen DEFINES += QUICKOPEN_LIBRARY -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(quickopen_dependencies.pri) HEADERS += quickopenplugin.h \ quickopentoolwindow.h \ diff --git a/src/plugins/regexp/regexp.pro b/src/plugins/regexp/regexp.pro index dfe52ef02454ded159f881f1412476eb69a04da2..98e20b317e8c070c25cedf885a2160fe4dec8967 100644 --- a/src/plugins/regexp/regexp.pro +++ b/src/plugins/regexp/regexp.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = RegExp -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/coreplugin/coreplugin.pri) QT += xml diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro index c90cafffe53549a642efce6c132be3f63541704d..8d55df33f25fb3d0ed503a09c1284fff52773975 100644 --- a/src/plugins/resourceeditor/resourceeditor.pro +++ b/src/plugins/resourceeditor/resourceeditor.pro @@ -3,7 +3,7 @@ TARGET = ResourceEditor qtAddLibrary(QtDesigner) -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../libs/utils/utils.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../shared/qrceditor/qrceditor.pri) diff --git a/src/plugins/snippets/snippets.pro b/src/plugins/snippets/snippets.pro index bbfb4b75b592f9441e4dd92add38685720dacc1a..99d391e73f55caec4a4b4a29476deb9d82e40dd5 100644 --- a/src/plugins/snippets/snippets.pro +++ b/src/plugins/snippets/snippets.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = Snippets QT += xml -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/texteditor/texteditor.pri) diff --git a/src/plugins/subversion/subversion.pro b/src/plugins/subversion/subversion.pro index 270693347c3bb6464b75ed0bf38e3271d8b53535..985a32648e1b5f49500fd0477e09f39b42a45aac 100644 --- a/src/plugins/subversion/subversion.pro +++ b/src/plugins/subversion/subversion.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = Subversion -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/texteditor/texteditor.pri) include(../../plugins/coreplugin/coreplugin.pri) diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro index a16a898b1d74b5fa540269f2df4b76b4cc023805..be36fe0ef91e1f9db1fdd9e34b60780c4caeede4 100644 --- a/src/plugins/texteditor/texteditor.pro +++ b/src/plugins/texteditor/texteditor.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = TextEditor DEFINES += TEXTEDITOR_LIBRARY -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(texteditor_dependencies.pri) SOURCES += texteditorplugin.cpp \ textfilewizard.cpp \ diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro index 510dbf5982614a657f6525fc4265f7564f08969a..be345d2ad54fe55bf298ab3d1977377652c8b6eb 100644 --- a/src/plugins/vcsbase/vcsbase.pro +++ b/src/plugins/vcsbase/vcsbase.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = VCSBase DEFINES += VCSBASE_LIBRARY -include(../../qworkbenchplugin.pri) +include(../../qtcreatorplugin.pri) include(vcsbase_dependencies.pri) HEADERS += vcsbase_global.h \ vcsbaseconstants.h \ diff --git a/src/qworkbenchplugin.pri b/src/qtcreatorplugin.pri similarity index 96% rename from src/qworkbenchplugin.pri rename to src/qtcreatorplugin.pri index d65e94c747e337d94fc5772879415da2624fe199..cb3e57f4e89ce44ce909d293246ba9fcede935ab 100644 --- a/src/qworkbenchplugin.pri +++ b/src/qtcreatorplugin.pri @@ -11,7 +11,7 @@ DEPENDPATH += $$IDE_SOURCE_TREE/src/plugins # copy the plugin spec isEmpty(TARGET) { - error("qworkbenchplugin.pri: You must provide a TARGET") + error("qtcreatorplugin.pri: You must provide a TARGET") } PLUGINSPECS = $${_PRO_FILE_PWD_}/$${TARGET}.pluginspec