diff --git a/src/libs/aggregation/aggregation.pro b/src/libs/aggregation/aggregation.pro
index b601bbc0610d5ae5d608cc50f2e315ae4b142534..3dd667bf0fdddc6ec43cef93951840e972d5de8b 100644
--- a/src/libs/aggregation/aggregation.pro
+++ b/src/libs/aggregation/aggregation.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Aggregation
 
 include(../../qtcreatorlibrary.pri)
diff --git a/src/libs/cplusplus/cplusplus.pro b/src/libs/cplusplus/cplusplus.pro
index bc8d2f23e0175c249c4aeab36f61d0d4b4ceb650..8a586162df25c189bf0bf61cdf69cddc4c38ecac 100644
--- a/src/libs/cplusplus/cplusplus.pro
+++ b/src/libs/cplusplus/cplusplus.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = CPlusPlus
 
 DEFINES += NDEBUG
diff --git a/src/libs/extensionsystem/extensionsystem.pro b/src/libs/extensionsystem/extensionsystem.pro
index dd510b090136c0d195469930ade8ed85486836e8..18314279c55e43ee5be6e1c19e10e0321e063e12 100644
--- a/src/libs/extensionsystem/extensionsystem.pro
+++ b/src/libs/extensionsystem/extensionsystem.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = ExtensionSystem
 DEFINES += EXTENSIONSYSTEM_LIBRARY
 include(../../qtcreatorlibrary.pri)
diff --git a/src/libs/glsl/glsl.pro b/src/libs/glsl/glsl.pro
index 3678588a4717c1dc76c1e667f0c3825b15fb54e0..089a9d04c6860d8f6b3d9787e7b5f4cc16c8f4fd 100644
--- a/src/libs/glsl/glsl.pro
+++ b/src/libs/glsl/glsl.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = GLSL
 DEFINES += \
     GLSL_BUILD_LIB
diff --git a/src/libs/languageutils/languageutils.pro b/src/libs/languageutils/languageutils.pro
index b1d7649aaa768d7ef67e3d94491e5b012f981519..e643380b09050d9736d1fd4dc1d350ad42931a33 100644
--- a/src/libs/languageutils/languageutils.pro
+++ b/src/libs/languageutils/languageutils.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = LanguageUtils
 
 unix:QMAKE_CXXFLAGS_DEBUG += -O3
diff --git a/src/libs/qmldebug/qmldebug.pro b/src/libs/qmldebug/qmldebug.pro
index 26a1a4085660953078b4b751d8d0fe9841256831..1a4e2441f66fd1cba084f1bab840a567b8ff65d7 100644
--- a/src/libs/qmldebug/qmldebug.pro
+++ b/src/libs/qmldebug/qmldebug.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QmlDebug
 QT += network
 
diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.pro b/src/libs/qmleditorwidgets/qmleditorwidgets.pro
index a6cb68e158d05d542916f9ba6c088c0c54905405..05d6b29eb725734b95ce12be21dda4709e9b6a9f 100644
--- a/src/libs/qmleditorwidgets/qmleditorwidgets.pro
+++ b/src/libs/qmleditorwidgets/qmleditorwidgets.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QmlEditorWidgets
 
 DEFINES += QWEAKPOINTER_ENABLE_ARROW
diff --git a/src/libs/qmljs/qmljs.pro b/src/libs/qmljs/qmljs.pro
index a5d788151c44fd841957cc329147f01b52ccd649..6bac9b89872604025ec3c601b7f0d11ef5aeddd4 100644
--- a/src/libs/qmljs/qmljs.pro
+++ b/src/libs/qmljs/qmljs.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QmlJS
 DEFINES += QMLJS_BUILD_DIR
 
diff --git a/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro b/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro
index c99f940d94c8be3cf14fd548f70368c53e188b2b..2b7c09f3a2d616e079dcae4f6179b271eeb4f3c5 100644
--- a/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro
+++ b/src/libs/qtcreatorcdbext/qtcreatorcdbext.pro
@@ -1,5 +1,4 @@
 # Build the Qt Creator CDB extension
-TEMPLATE = lib
 
 include(../../../qtcreator.pri)
 include(cdb_detect.pri)
diff --git a/src/libs/ssh/ssh.pro b/src/libs/ssh/ssh.pro
index 2d8f9efe19116d8202d5eb225dc4c020fe195237..2dd4d12aab9853f9d80ee5fc7745303b35e401d3 100644
--- a/src/libs/ssh/ssh.pro
+++ b/src/libs/ssh/ssh.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QtcSsh
 QT += gui network
 DEFINES += QSSH_LIBRARY
diff --git a/src/libs/utils/utils.pro b/src/libs/utils/utils.pro
index 9747f74ae3c12e13ccdf423ef79468c9fd3e19d3..d68d998b375cfe5bf24e99a44e2454a9f75fab70 100644
--- a/src/libs/utils/utils.pro
+++ b/src/libs/utils/utils.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Utils
 QT += gui network
 
diff --git a/src/libs/zeroconf/zeroconf.pro b/src/libs/zeroconf/zeroconf.pro
index 0d5c07b31cce989a24e8ee8515063b6d3020caaa..86a3029881f44203aa1aa31876aacb23d5e1f94b 100644
--- a/src/libs/zeroconf/zeroconf.pro
+++ b/src/libs/zeroconf/zeroconf.pro
@@ -3,7 +3,6 @@ QT       += network
 CONFIG   += exceptions
 
 TARGET = zeroconf
-TEMPLATE = lib
 
 DEFINES += ZEROCONF_LIBRARY
 
diff --git a/src/plugins/analyzerbase/analyzerbase.pro b/src/plugins/analyzerbase/analyzerbase.pro
index e9ac91cfae3309111d9ad7251fa32a4c08b7f75c..7d68a9cce4fb7277167f5ad1ca0c9772769843c4 100644
--- a/src/plugins/analyzerbase/analyzerbase.pro
+++ b/src/plugins/analyzerbase/analyzerbase.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = AnalyzerBase
 
 DEFINES += ANALYZER_LIBRARY
diff --git a/src/plugins/android/android.pro b/src/plugins/android/android.pro
index 9e55db74f3ed4c625340f29e26dfd47547d3ffcc..106526a666364b9f7ecf5f9becd7d4068ad3228d 100644
--- a/src/plugins/android/android.pro
+++ b/src/plugins/android/android.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Android
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
index e68b6383b4a1bbfdb06779a3c0d4d765339c11c4..57bcafb10e160b9ed6dfe9ff1a33d63092436a35 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
+++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = AutotoolsProjectManager
 #PROVIDER = Openismus
 
diff --git a/src/plugins/bazaar/bazaar.pro b/src/plugins/bazaar/bazaar.pro
index 3dd86dbb1fe630fee31a327adf9bab692ecaf644..1446cf975c049daa1c94e742b0e105c456486ac4 100644
--- a/src/plugins/bazaar/bazaar.pro
+++ b/src/plugins/bazaar/bazaar.pro
@@ -1,5 +1,4 @@
 TARGET = Bazaar
-TEMPLATE = lib
 include(../../qtcreatorplugin.pri)
 SOURCES += \
     bazaarclient.cpp \
diff --git a/src/plugins/bineditor/bineditor.pro b/src/plugins/bineditor/bineditor.pro
index edd8c5379995fefd6ec6e576d4a67987e9505ebd..22e8903aba0f572833fc09691f92d0e279b3ff33 100644
--- a/src/plugins/bineditor/bineditor.pro
+++ b/src/plugins/bineditor/bineditor.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = BinEditor
 include(../../qtcreatorplugin.pri)
 
diff --git a/src/plugins/bookmarks/bookmarks.pro b/src/plugins/bookmarks/bookmarks.pro
index 2a84388335d164d7a2f2f5f267ef5d10bb6cdd8e..a422e785165958229b5b17c1eeed0ae6db9bbf99 100644
--- a/src/plugins/bookmarks/bookmarks.pro
+++ b/src/plugins/bookmarks/bookmarks.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET   = Bookmarks
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/classview/classview.pro b/src/plugins/classview/classview.pro
index 0fa8a182537f46b608bde659e4bcb24101139cf5..1ff31926c84c92c18ab3c5370e27d53f93a212d1 100644
--- a/src/plugins/classview/classview.pro
+++ b/src/plugins/classview/classview.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = ClassView
 include(../../qtcreatorplugin.pri)
 
diff --git a/src/plugins/clearcase/clearcase.pro b/src/plugins/clearcase/clearcase.pro
index 3e7eaf150ce91a6f9321c67699b0b4ed4df22d01..7dc257068dce8e01ce4a1dbad0ac28bb043f2d14 100644
--- a/src/plugins/clearcase/clearcase.pro
+++ b/src/plugins/clearcase/clearcase.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = ClearCase
 # PROVIDER = AudioCodes
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
index 715412ed7b1701a6466b974ef8cf56789dec81f2..81e651cc3e71b8e12c19ae97f07ba95ab69ad884 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = CMakeProjectManager
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index 34e562bdf71fadd9f46b9898f84709a9377bc393..78742ec37ee3381244002ded4bf76670ae97b17a 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Core
 DEFINES += CORE_LIBRARY
 QT += network \
diff --git a/src/plugins/cpaster/cpaster.pro b/src/plugins/cpaster/cpaster.pro
index 215d865bd801705d8945155d0a75233a66c688eb..67f676220230ca7b27ee9e22452049501e92649d 100644
--- a/src/plugins/cpaster/cpaster.pro
+++ b/src/plugins/cpaster/cpaster.pro
@@ -1,5 +1,4 @@
 QT += network
-TEMPLATE = lib
 TARGET = CodePaster
 include(../../qtcreatorplugin.pri)
 HEADERS += cpasterplugin.h \
diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro
index 470b2b9907fe9a75b82099a003624797933708a0..6465fdd5ca429dea7917b8c65b05eec04a5b6ffe 100644
--- a/src/plugins/cppeditor/cppeditor.pro
+++ b/src/plugins/cppeditor/cppeditor.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = CppEditor
 DEFINES += CPPEDITOR_LIBRARY
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro
index 5232d6c5e7fffdcc3fb5309617e77cb1f5cfd2b8..448b72326ec6c046e6dd351c116bc89b7dce96e4 100644
--- a/src/plugins/cpptools/cpptools.pro
+++ b/src/plugins/cpptools/cpptools.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = CppTools
 include(../../qtcreatorplugin.pri)
 
diff --git a/src/plugins/cvs/cvs.pro b/src/plugins/cvs/cvs.pro
index 4bef655f54edc6a3998c45e3407b92db70b6607f..0578df6d15579832a18959a309e3ed374a01b6e7 100644
--- a/src/plugins/cvs/cvs.pro
+++ b/src/plugins/cvs/cvs.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = CVS
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 4ab6115ee2a718ccba9d339ba49777bd39d2b729..9c10d6acbc0546256e5c2b9fec17700e13bbe51b 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Debugger
 
 # DEFINES += QT_USE_FAST_OPERATOR_PLUS
diff --git a/src/plugins/designer/designer.pro b/src/plugins/designer/designer.pro
index cc5f330baf097f42c5a255a9cd78a2002566611c..a51cf20c80044758756b2b5b0a6960e7cdd6fdb1 100644
--- a/src/plugins/designer/designer.pro
+++ b/src/plugins/designer/designer.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Designer
 DEFINES += DESIGNER_LIBRARY
 
diff --git a/src/plugins/diffeditor/diffeditor.pro b/src/plugins/diffeditor/diffeditor.pro
index 38266d477254c288baec7bc5e0904356baa196dd..bba1658557f6c5f16d9e62e78d2ca89dfbedc348 100644
--- a/src/plugins/diffeditor/diffeditor.pro
+++ b/src/plugins/diffeditor/diffeditor.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = DiffEditor
 DEFINES += DIFFEDITOR_LIBRARY
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/fakevim/fakevim.pro b/src/plugins/fakevim/fakevim.pro
index 308343a0e54ba10afa2414fff2b6fcd1a2982a72..e28f787d656b37987f77123bea07482ff0df6960 100644
--- a/src/plugins/fakevim/fakevim.pro
+++ b/src/plugins/fakevim/fakevim.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = FakeVim
 
 # CONFIG += single
diff --git a/src/plugins/find/find.pro b/src/plugins/find/find.pro
index f5e662a2ddc8dcab3d81e4fb3db35c7eb9cf3c45..2437c80dfe915994433aa1f4db943206cb9e95c0 100644
--- a/src/plugins/find/find.pro
+++ b/src/plugins/find/find.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Find
 include(../../qtcreatorplugin.pri)
 DEFINES += FIND_LIBRARY
diff --git a/src/plugins/genericprojectmanager/genericprojectmanager.pro b/src/plugins/genericprojectmanager/genericprojectmanager.pro
index 3dfa78deaa71dc0d1ae5ba6c04ee2af951dcf649..3f603e26f6d8942ba5aad37904a646302fe6d8e7 100644
--- a/src/plugins/genericprojectmanager/genericprojectmanager.pro
+++ b/src/plugins/genericprojectmanager/genericprojectmanager.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = GenericProjectManager
 include(../../qtcreatorplugin.pri)
 
diff --git a/src/plugins/git/git.pro b/src/plugins/git/git.pro
index 3b2a852669f7e35dcd34613fc7b3333ae58f3c70..dc32a33ab5eb1cc3c1b74b3249ae851d05ef5b2b 100644
--- a/src/plugins/git/git.pro
+++ b/src/plugins/git/git.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Git
 include(../../qtcreatorplugin.pri)
 HEADERS += gitplugin.h \
diff --git a/src/plugins/glsleditor/glsleditor.pro b/src/plugins/glsleditor/glsleditor.pro
index 98c241d57ce13fabd8c5364d5a9c505021bf0808..ad36551071a15e576910e87b0c07131e749b2291 100644
--- a/src/plugins/glsleditor/glsleditor.pro
+++ b/src/plugins/glsleditor/glsleditor.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = GLSLEditor
 include(../../qtcreatorplugin.pri)
 
diff --git a/src/plugins/helloworld/helloworld.pro b/src/plugins/helloworld/helloworld.pro
index 0bfe6a52d9569a0647f213970f9e44a22813374a..ab18eacc30c490724a18f8709b52de46fef2ef7f 100644
--- a/src/plugins/helloworld/helloworld.pro
+++ b/src/plugins/helloworld/helloworld.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = HelloWorld
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro
index c568adeef9f103a6b7e3ce16c945505cb0d1a4fb..ba0c3fea6e934b1dd40aa818894c41253dea3efb 100644
--- a/src/plugins/help/help.pro
+++ b/src/plugins/help/help.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Help
 
 QT += network
diff --git a/src/plugins/imageviewer/imageviewer.pro b/src/plugins/imageviewer/imageviewer.pro
index 764ed97b95af6b453c34e0830b6827e64ef36b5f..6be7741241f8b20d982c625fd0930c4db346aeec 100644
--- a/src/plugins/imageviewer/imageviewer.pro
+++ b/src/plugins/imageviewer/imageviewer.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = ImageViewer
 include(../../qtcreatorplugin.pri)
 
diff --git a/src/plugins/locator/locator.pro b/src/plugins/locator/locator.pro
index e3f395bafff706a8076c0fce908788e52b8c43ce..324a0f02553247d69de5814b2de70ee8c766c763 100644
--- a/src/plugins/locator/locator.pro
+++ b/src/plugins/locator/locator.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Locator
 DEFINES += LOCATOR_LIBRARY
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/macros/macros.pro b/src/plugins/macros/macros.pro
index 3ddac11ef5cd2ce28a59b77082833ef0575190f9..23347ce72f1e1c808c7212f5fa22f99ac174817f 100644
--- a/src/plugins/macros/macros.pro
+++ b/src/plugins/macros/macros.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Macros
 
 DEFINES += MACROS_LIBRARY
diff --git a/src/plugins/madde/madde.pro b/src/plugins/madde/madde.pro
index 5253241e1998c391ec6fcad9282aaa9cd17e93f3..a167cd0b3eca4b31b17f05622480f147569c7e22 100644
--- a/src/plugins/madde/madde.pro
+++ b/src/plugins/madde/madde.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Madde
 QT += network
 
diff --git a/src/plugins/mercurial/mercurial.pro b/src/plugins/mercurial/mercurial.pro
index fdf345e5f3c05cfd09dfc3523bb434b12eb77c12..08703827d63b49f0c01eaf710f5f31cf0aaf10a2 100644
--- a/src/plugins/mercurial/mercurial.pro
+++ b/src/plugins/mercurial/mercurial.pro
@@ -1,5 +1,4 @@
 TARGET = Mercurial
-TEMPLATE = lib
 include(../../qtcreatorplugin.pri)
 SOURCES += mercurialplugin.cpp \
     optionspage.cpp \
diff --git a/src/plugins/perforce/perforce.pro b/src/plugins/perforce/perforce.pro
index b3d17a24671eeeae8123c642202ea58911a77e67..aed73d5ec3da43abf663ca071270a31c0e45e470 100644
--- a/src/plugins/perforce/perforce.pro
+++ b/src/plugins/perforce/perforce.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Perforce
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index a840754267cdf641bd0a8872264868e754ecf517..36ea292dfbc2a1c575f0b12327264cdeb83e7954 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = ProjectExplorer
 QT += xml script declarative
 
diff --git a/src/plugins/pythoneditor/pythoneditor.pro b/src/plugins/pythoneditor/pythoneditor.pro
index 6e3561315ceca00a87a6b3cc9cc607b0aa06266f..39a394412b56ae54f15e388b4e054e05df30684b 100644
--- a/src/plugins/pythoneditor/pythoneditor.pro
+++ b/src/plugins/pythoneditor/pythoneditor.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = PythonEditor
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
index 845e33de7329b712bc264191f750f67bc89d394e..3e17a6c8977447506128032884343b1206f32ce4 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QbsProjectManager
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.pro b/src/plugins/qmldesigner/qmldesignerplugin.pro
index 264b230083263ca623525e037ed5e64515974126..4bb8dfce777e3d1dfd6e7808a5cbdc1ece8cd956 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.pro
+++ b/src/plugins/qmldesigner/qmldesignerplugin.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QmlDesigner
 
 CONFIG += exceptions
diff --git a/src/plugins/qmljseditor/qmljseditor.pro b/src/plugins/qmljseditor/qmljseditor.pro
index 48631aa79f74dd972d27388ba6505b7b9101b4f5..9b8d20569a7fe684fd5269c8862ad749176b384c 100644
--- a/src/plugins/qmljseditor/qmljseditor.pro
+++ b/src/plugins/qmljseditor/qmljseditor.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QmlJSEditor
 include(../../qtcreatorplugin.pri)
 QT += script
diff --git a/src/plugins/qmljstools/qmljstools.pro b/src/plugins/qmljstools/qmljstools.pro
index 6ddfc3c97731cf7ba45996a35b142e5541e22858..74706cea50eb4072aa6a33299e610f82316e11f7 100644
--- a/src/plugins/qmljstools/qmljstools.pro
+++ b/src/plugins/qmljstools/qmljstools.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QmlJSTools
 include(../../qtcreatorplugin.pri)
 
diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro
index be47f04149adce56b870c0de00fe293573613c38..11acc07d2ae9069d00430b8c4ab588c4ee944a11 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.pro
+++ b/src/plugins/qmlprofiler/qmlprofiler.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QmlProfiler
 
 DEFINES += QMLPROFILER_LIBRARY
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
index 52cbe4105cdf5277ddad383c5c0e9b9f49c5dabd..f2cabb403b9a41f9950c97570645460d3ef0ce5a 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QmlProjectManager
 
 QT += network declarative
diff --git a/src/plugins/qnx/qnx.pro b/src/plugins/qnx/qnx.pro
index a6b6d64a23e99501a61873d302a2b2d766916e97..e6fc1a04321dc9bedaff2888ab270fb4e5233294 100644
--- a/src/plugins/qnx/qnx.pro
+++ b/src/plugins/qnx/qnx.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Qnx
 QT += network xml
 PROVIDER = BlackBerry
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pro b/src/plugins/qt4projectmanager/qt4projectmanager.pro
index 4f4188aa18c19501ee25edc80e6ab9755e85a5d6..7ed43bfaa43ce2960877f6a50157a9b7d3743864 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pro
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Qt4ProjectManager
 QT += network
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/qtsupport/qtsupport.pro b/src/plugins/qtsupport/qtsupport.pro
index 3c9e29d59bbc82b96017e67e7af3709472b25a2d..87d4fc6ae287ab34c1777de833c64f0b930c3386 100644
--- a/src/plugins/qtsupport/qtsupport.pro
+++ b/src/plugins/qtsupport/qtsupport.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = QtSupport
 DEFINES += QTSUPPORT_LIBRARY
 QT += network declarative
diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro
index a7841aa0f130bd7b24d63ce293c0ab6894c3c3e0..65baabd089503bfd97277c88fcaf5e89249cc652 100644
--- a/src/plugins/remotelinux/remotelinux.pro
+++ b/src/plugins/remotelinux/remotelinux.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = RemoteLinux
 QT += network
 
diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro
index f6641e841d6329ac430a7ac90dbe9b07b065d19f..8af1c099aa662b3ee83284ea1187c3f8897ce654 100644
--- a/src/plugins/resourceeditor/resourceeditor.pro
+++ b/src/plugins/resourceeditor/resourceeditor.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = ResourceEditor
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/subversion/subversion.pro b/src/plugins/subversion/subversion.pro
index ff5d8f0221422b4534d69075ceff5f487f151f25..6316266f05762ee638b8715dd1d61b0656a8052e 100644
--- a/src/plugins/subversion/subversion.pro
+++ b/src/plugins/subversion/subversion.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Subversion
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/tasklist/tasklist.pro b/src/plugins/tasklist/tasklist.pro
index 058553f489a877374e6ea7162888295aacb5a1d4..99b5dff0f597b5335170d2021bc87dbff3d76040 100644
--- a/src/plugins/tasklist/tasklist.pro
+++ b/src/plugins/tasklist/tasklist.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = TaskList
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/texteditor/texteditor.pro b/src/plugins/texteditor/texteditor.pro
index b846fd2f7b5a3cf4d8e54bae2fe46ab8f3e53580..92f6cdf252bdbe7d0b3ee1c2a47a786442a0c7be 100644
--- a/src/plugins/texteditor/texteditor.pro
+++ b/src/plugins/texteditor/texteditor.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = TextEditor
 DEFINES += TEXTEDITOR_LIBRARY
 QT += xml network
diff --git a/src/plugins/todo/todo.pro b/src/plugins/todo/todo.pro
index 83fb3af96825a06994e6ada86e4aee104bfee489..2ca6adc04c7a7bbcecbe0f07416d33b226522de8 100644
--- a/src/plugins/todo/todo.pro
+++ b/src/plugins/todo/todo.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Todo
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/updateinfo/updateinfo.pro b/src/plugins/updateinfo/updateinfo.pro
index 07037b40945f0ef9775e27d8d8afc2b845ed92d0..3b5425b819bee852be2101cddee3113a965667d6 100644
--- a/src/plugins/updateinfo/updateinfo.pro
+++ b/src/plugins/updateinfo/updateinfo.pro
@@ -1,5 +1,4 @@
 TARGET = UpdateInfo
-TEMPLATE = lib
 QT += network xml
 
 HEADERS += updateinfoplugin.h \
diff --git a/src/plugins/valgrind/valgrind.pro b/src/plugins/valgrind/valgrind.pro
index 85a3e076f17cbfd6620d8f18b3964976b52a9117..87ba3a1a15e458399b1e10dbe6b8d49746e529d7 100644
--- a/src/plugins/valgrind/valgrind.pro
+++ b/src/plugins/valgrind/valgrind.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Valgrind
 
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/vcsbase/vcsbase.pro b/src/plugins/vcsbase/vcsbase.pro
index 75b41c7c67a5f6783315a090525ee55bf240fbe3..72e553b7a20cfda7b0f2d825dd591ea5532cc4cc 100644
--- a/src/plugins/vcsbase/vcsbase.pro
+++ b/src/plugins/vcsbase/vcsbase.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = VcsBase
 DEFINES += VCSBASE_LIBRARY
 include(../../qtcreatorplugin.pri)
diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro
index 30d02d54ff3d2026df112ef4666a9257b138a9a3..824184133db4487d78a7dd15804a605ea901d357 100644
--- a/src/plugins/welcome/welcome.pro
+++ b/src/plugins/welcome/welcome.pro
@@ -1,4 +1,3 @@
-TEMPLATE = lib
 TARGET = Welcome
 QT += network declarative
 
diff --git a/src/qtcreatorlibrary.pri b/src/qtcreatorlibrary.pri
index ae3fdc3b98bf6bc8392f28601e99b457bf883183..2860c84c1190e3b966afdd42f698b7267fb6a978 100644
--- a/src/qtcreatorlibrary.pri
+++ b/src/qtcreatorlibrary.pri
@@ -15,6 +15,7 @@ include(rpath.pri)
 
 TARGET = $$qtLibraryName($$TARGET)
 
+TEMPLATE = lib
 CONFIG += shared dll
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index 758e83ea28590820fb306fd2d24b1d0198343ab2..a5369fccab87c8fbebbdd22ae5e02526e66b6a81 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -108,6 +108,7 @@ CONFIG += include_source_dir
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
+TEMPLATE = lib
 CONFIG += plugin plugin_with_soname
 linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF