centralize addition of pluginspecs to OTHER_FILES

33 files changed, 10 insertions, 53 deletions

diff --git a/src/plugins/bineditor/bineditor.pro b/src/plugins/bineditor/bineditor.pro
index e7986d27b6..0ccd430829 100644
--- a/src/plugins/bineditor/bineditor.pro
+++ b/src/plugins/bineditor/bineditor.pro
@@ -11,5 +11,3 @@ SOURCES += bineditorplugin.cpp \
         bineditor.cpp
 
 RESOURCES +=
-
-OTHER_FILES += BinEditor.pluginspec
diff --git a/src/plugins/bookmarks/bookmarks.pro b/src/plugins/bookmarks/bookmarks.pro
index 9d3ca71865..ec84fb7511 100644
--- a/src/plugins/bookmarks/bookmarks.pro
+++ b/src/plugins/bookmarks/bookmarks.pro
@@ -16,5 +16,3 @@ SOURCES += bookmarksplugin.cpp \
            bookmarkmanager.cpp
 
 RESOURCES += bookmarks.qrc
-
-OTHER_FILES += Bookmarks.pluginspec
diff --git a/src/plugins/classview/classview.pro b/src/plugins/classview/classview.pro
index 944ca84927..145bbc227f 100644
--- a/src/plugins/classview/classview.pro
+++ b/src/plugins/classview/classview.pro
@@ -28,9 +28,6 @@ SOURCES += \
     classviewutils.cpp \
     classviewtreeitemmodel.cpp
 
-OTHER_FILES += \
-    ClassView.pluginspec
-
 FORMS += \
     classviewnavigationwidget.ui
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
index 1f54025a5e..370330860e 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
@@ -32,5 +32,4 @@ SOURCES = cmakeproject.cpp \
 RESOURCES += cmakeproject.qrc
 FORMS +=
 
-OTHER_FILES += CMakeProjectManager.pluginspec \
-               CMakeProject.mimetypes.xml
+OTHER_FILES += CMakeProject.mimetypes.xml
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index be7bee06ea..2bc24e65f3 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -248,4 +248,4 @@ else:unix {
     images.path = /share/pixmaps
     INSTALLS += images
 }
-OTHER_FILES += Core.pluginspec editormanager/BinFiles.mimetypes.xml
+OTHER_FILES += editormanager/BinFiles.mimetypes.xml
diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro
index 78db8ed311..5eb1ef92e3 100644
--- a/src/plugins/cppeditor/cppeditor.pro
+++ b/src/plugins/cppeditor/cppeditor.pro
@@ -40,5 +40,4 @@ SOURCES += cppplugin.cpp \
     cppelementevaluator.cpp \
     cppquickfixcollector.cpp
 RESOURCES += cppeditor.qrc
-OTHER_FILES += CppEditor.pluginspec \
-    CppEditor.mimetypes.xml
+OTHER_FILES += CppEditor.mimetypes.xml
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index be6a5cfde8..57507f3612 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -52,5 +52,3 @@ SOURCES += completionsettingspage.cpp \
 
 FORMS += completionsettingspage.ui \
     cppfilesettingspage.ui
-
-OTHER_FILES += CppTools.pluginspec
diff --git a/src/plugins/cvs/cvs.pro b/src/plugins/cvs/cvs.pro
index c4f6478e93..0f042def66 100644
--- a/src/plugins/cvs/cvs.pro
+++ b/src/plugins/cvs/cvs.pro
@@ -34,5 +34,3 @@ SOURCES += annotationhighlighter.cpp \
 FORMS += settingspage.ui
 
 RESOURCES += cvs.qrc
-
-OTHER_FILES += CVS.pluginspec
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 0dcfe624d5..39b78dd2a1 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -131,6 +131,3 @@ contains(QT_CONFIG, declarative) {
 
 include(tcf/tcf.pri)
 include(shared/shared.pri)
-
-
-OTHER_FILES += Debugger.pluginspec
diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index 83b0ce035d..0437569573 100644
--- a/src/plugins/designer/designer.pro
+++ b/src/plugins/designer/designer.pro
@@ -62,4 +62,4 @@ SOURCES += formeditorplugin.cpp \
 
 RESOURCES += designer.qrc
 
-OTHER_FILES += Designer.pluginspec Designer.mimetypes.xml README.txt
+OTHER_FILES += Designer.mimetypes.xml README.txt
diff --git a/src/plugins/fakevim/fakevim.pro b/src/plugins/fakevim/fakevim.pro
index adffef024e..1c282309f1 100644
--- a/src/plugins/fakevim/fakevim.pro
+++ b/src/plugins/fakevim/fakevim.pro
@@ -21,4 +21,3 @@ HEADERS += fakevimactions.h \
     fakevimsyntax.h \
     fakevimplugin.h
 FORMS += fakevimoptions.ui
-OTHER_FILES += FakeVim.pluginspec
diff --git a/src/plugins/find/find.pro b/src/plugins/find/find.pro
index d0f67a405c..c0c93d3625 100644
--- a/src/plugins/find/find.pro
+++ b/src/plugins/find/find.pro
@@ -32,5 +32,3 @@ SOURCES += findtoolwindow.cpp \
 FORMS += findwidget.ui \
     finddialog.ui
 RESOURCES += find.qrc
-
-OTHER_FILES += Find.pluginspec
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.pro b/src/plugins/genericprojectmanager/genericprojectmanager.pro
index 0c3e3ee304..48a51d874e 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.pro
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.pro
@@ -25,4 +25,3 @@ SOURCES = genericproject.cpp \
     genericbuildconfiguration.cpp
 RESOURCES += genericproject.qrc
 FORMS += genericmakestep.ui
-OTHER_FILES += GenericProjectManager.pluginspec
diff --git a/src/plugins/git/git.pro b/src/plugins/git/git.pro
index 7ffe7d8999..435519768a 100644
--- a/src/plugins/git/git.pro
+++ b/src/plugins/git/git.pro
@@ -48,7 +48,6 @@ FORMS += changeselectiondialog.ui \
     gitsubmitpanel.ui \
     branchdialog.ui \
     stashdialog.ui
-OTHER_FILES += ScmGit.pluginspec
 include(gitorious/gitorious.pri)
 
 RESOURCES += \
diff --git a/src/plugins/helloworld/helloworld.pro b/src/plugins/helloworld/helloworld.pro
index aae1323868..9ef9b48f33 100644
--- a/src/plugins/helloworld/helloworld.pro
+++ b/src/plugins/helloworld/helloworld.pro
@@ -9,5 +9,3 @@ HEADERS += helloworldplugin.h \
 
 SOURCES += helloworldplugin.cpp \
     helloworldwindow.cpp
-
-OTHER_FILES += helloworld.pluginspec
diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index 451fc5d3d3..137592e41d 100644
--- a/src/plugins/help/help.pro
+++ b/src/plugins/help/help.pro
@@ -64,5 +64,3 @@ include(../../shared/help/help.pri)
 contains(QT_CONFIG, webkit) {
     QT += webkit
 }
-
-OTHER_FILES += Help.pluginspec
diff --git a/src/plugins/imageviewer/imageviewer.pro b/src/plugins/imageviewer/imageviewer.pro
index 41d64bfb11..40a15d89b7 100644
--- a/src/plugins/imageviewer/imageviewer.pro
+++ b/src/plugins/imageviewer/imageviewer.pro
@@ -24,7 +24,6 @@ RESOURCES += \
     imageviewer.qrc
 
 OTHER_FILES += \
-    ImageViewer.pluginspec \
     ImageViewer.mimetypes.xml
 
 contains(QT_CONFIG, svg):QT += svg
diff --git a/src/plugins/locator/locator.pro b/src/plugins/locator/locator.pro
index 7844b742aa..2d81975fa5 100644
--- a/src/plugins/locator/locator.pro
+++ b/src/plugins/locator/locator.pro
@@ -32,5 +32,3 @@ FORMS += settingspage.ui \
     filesystemfilter.ui \
     directoryfilter.ui
 RESOURCES += locator.qrc
-
-OTHER_FILES += Locator.pluginspec
diff --git a/src/plugins/mercurial/mercurial.pro b/src/plugins/mercurial/mercurial.pro
index 9b52048b32..f532f20471 100644
--- a/src/plugins/mercurial/mercurial.pro
+++ b/src/plugins/mercurial/mercurial.pro
@@ -31,7 +31,6 @@ HEADERS += mercurialplugin.h \
     clonewizardpage.h \
     clonewizard.h \
     mercurialsettings.h
-OTHER_FILES += Mercurial.pluginspec
 FORMS += optionspage.ui \
     revertdialog.ui \
     srcdestdialog.ui \
diff --git a/src/plugins/perforce/perforce.pro b/src/plugins/perforce/perforce.pro
index 27d398f0f3..7754b7fae5 100644
--- a/src/plugins/perforce/perforce.pro
+++ b/src/plugins/perforce/perforce.pro
@@ -36,5 +36,3 @@ FORMS += settingspage.ui \
     submitpanel.ui
 
 RESOURCES += perforce.qrc
-
-OTHER_FILES += Perforce.pluginspec
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 3dd702f50b..d94d459d88 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -204,4 +204,3 @@ win32 {
 }
 RESOURCES += projectexplorer.qrc
 DEFINES += PROJECTEXPLORER_LIBRARY
-OTHER_FILES += ProjectExplorer.pluginspec
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
index 8d563ddf94..ad7cf4efbf 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
@@ -34,5 +34,3 @@ SOURCES += qmldesignerplugin.cpp \
     styledoutputpaneplaceholder.cpp
 
 FORMS += settingspage.ui
-
-OTHER_FILES += QmlDesigner.pluginspec
diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro
index 2c3c302e29..53c7ca2bc9 100644
--- a/src/plugins/qmljseditor/qmljseditor.pro
+++ b/src/plugins/qmljseditor/qmljseditor.pro
@@ -65,7 +65,7 @@ SOURCES += \
     qmljssemantichighlighter.cpp
 
 RESOURCES += qmljseditor.qrc
-OTHER_FILES += QmlJSEditor.pluginspec QmlJSEditor.mimetypes.xml
+OTHER_FILES += QmlJSEditor.mimetypes.xml
 
 FORMS += \
     quicktoolbarsettingspage.ui \
diff --git a/src/plugins/qmljsinspector/qmljsinspector.pro b/src/plugins/qmljsinspector/qmljsinspector.pro
index 3ae7bab149..61e71483f3 100644
--- a/src/plugins/qmljsinspector/qmljsinspector.pro
+++ b/src/plugins/qmljsinspector/qmljsinspector.pro
@@ -35,7 +35,6 @@ qmljsobjecttree.cpp
 
 include(../../libs/qmljsdebugclient/qmljsdebugclient-lib.pri)
 
-OTHER_FILES += QmlJSInspector.pluginspec
 RESOURCES += qmljsinspector.qrc
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
index d18c79999b..349ca8193c 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
@@ -35,5 +35,4 @@ SOURCES += qmlproject.cpp \
 
 RESOURCES += qmlproject.qrc
 
-OTHER_FILES += QmlProjectManager.pluginspec \
-               QmlProject.mimetypes.xml
+OTHER_FILES += QmlProject.mimetypes.xml
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index e456017ebe..78fa9e4a0b 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -142,4 +142,4 @@ include(qt-s60/qt-s60.pri)
 include(qt-maemo/qt-maemo.pri)
 include(customwidgetwizard/customwidgetwizard.pri)
 DEFINES += QT_NO_CAST_TO_ASCII
-OTHER_FILES += Qt4ProjectManager.pluginspec Qt4ProjectManager.mimetypes.xml
+OTHER_FILES += Qt4ProjectManager.mimetypes.xml
diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro
index 8d55df33f2..c300b4c5b6 100644
--- a/src/plugins/resourceeditor/resourceeditor.pro
+++ b/src/plugins/resourceeditor/resourceeditor.pro
@@ -22,5 +22,3 @@ resourcewizard.cpp \
 resourceeditorw.cpp
 
 RESOURCES += resourceeditor.qrc
-
-OTHER_FILES += ResourceEditor.pluginspec
diff --git a/src/plugins/subversion/subversion.pro b/src/plugins/subversion/subversion.pro
index 3879d42568..6a46a3679a 100644
--- a/src/plugins/subversion/subversion.pro
+++ b/src/plugins/subversion/subversion.pro
@@ -31,5 +31,3 @@ SOURCES += annotationhighlighter.cpp \
 FORMS += settingspage.ui
 
 RESOURCES += subversion.qrc
-
-OTHER_FILES += Subversion.pluginspec
diff --git a/src/plugins/tasklist/tasklist.pro b/src/plugins/tasklist/tasklist.pro
index 388800a000..9c35d6aea9 100644
--- a/src/plugins/tasklist/tasklist.pro
+++ b/src/plugins/tasklist/tasklist.pro
@@ -19,5 +19,4 @@ SOURCES += tasklistplugin.cpp \
 
 RESOURCES += tasklist.qrc
 
-OTHER_FILES += TaskList.pluginspec \
-    TaskList.mimetypes.xml
+OTHER_FILES += TaskList.mimetypes.xml
diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro
index 21a4ba9952..3b84f9c979 100644
--- a/src/plugins/texteditor/texteditor.pro
+++ b/src/plugins/texteditor/texteditor.pro
@@ -153,4 +153,4 @@ FORMS += behaviorsettingspage.ui \
     generichighlighter/highlightersettingspage.ui \
     generichighlighter/managedefinitionsdialog.ui
 RESOURCES += texteditor.qrc
-OTHER_FILES += TextEditor.pluginspec TextEditor.mimetypes.xml
+OTHER_FILES += TextEditor.mimetypes.xml
diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro
index acf42be106..066deab63d 100644
--- a/src/plugins/vcsbase/vcsbase.pro
+++ b/src/plugins/vcsbase/vcsbase.pro
@@ -60,5 +60,3 @@ FORMS += commonsettingspage.ui \
     checkoutprogresswizardpage.ui \
     basecheckoutwizardpage.ui \
     cleandialog.ui
-
-OTHER_FILES += VCSBase.pluginspec
diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro
index f5ad9bbe9f..9fcb3be5f9 100644
--- a/src/plugins/welcome/welcome.pro
+++ b/src/plugins/welcome/welcome.pro
@@ -17,4 +17,3 @@ FORMS += welcomemode.ui \
     communitywelcomepagewidget.ui
 RESOURCES += welcome.qrc
 DEFINES += WELCOME_LIBRARY
-OTHER_FILES += Welcome.pluginspec
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index f27097c037..fc7b40ef07 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -26,6 +26,7 @@ copy2build.name = COPY ${QMAKE_FILE_IN}
 copy2build.CONFIG += no_link
 QMAKE_EXTRA_COMPILERS += copy2build
 
+OTHER_FILES += $$PLUGINSPECS
 
 macx {
     !isEmpty(TIGER_COMPAT_MODE) {