diff --git a/doc/api/examples/exampleplugin/exampleplugin.cpp b/doc/api/examples/exampleplugin/exampleplugin.cpp index 4223cb3321c..66ff782fc26 100644 --- a/doc/api/examples/exampleplugin/exampleplugin.cpp +++ b/doc/api/examples/exampleplugin/exampleplugin.cpp @@ -80,7 +80,3 @@ void ExamplePlugin::triggerAction() tr("This is an action from Example.")); } //! [slot implementation] - -//! [export plugin] -Q_EXPORT_PLUGIN2(Example, ExamplePlugin) -//! [export plugin] diff --git a/doc/api/first-plugin.qdoc b/doc/api/first-plugin.qdoc index 7f78439a76e..665b26b2f71 100644 --- a/doc/api/first-plugin.qdoc +++ b/doc/api/first-plugin.qdoc @@ -321,11 +321,4 @@ This part defines the code that is called when the menu item is triggered. It uses the Qt API to open a message box that displays informative text and an \gui OK button. - - \snippet exampleplugin/exampleplugin.cpp export plugin - - At the end of the file, the Qt macro \c{Q_EXPORT_PLUGIN2} is used to register - the plugin with Qt's plugin loader system. This is necessary for Qt to - be able to load your plugin. - */ diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp index f06752cef8e..401a0cf3a10 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.cpp @@ -75,5 +75,3 @@ void %PluginName%Plugin::triggerAction() tr("Action triggered"), tr("This is an action from %PluginName%.")); } - -Q_EXPORT_PLUGIN2(%PluginName%, %PluginName%Plugin) diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp index 5d144aaa18e..73a970b3842 100644 --- a/src/libs/extensionsystem/iplugin.cpp +++ b/src/libs/extensionsystem/iplugin.cpp @@ -55,9 +55,9 @@ Plugins must provide one implementation of the IPlugin class, located in a library that matches the \c name attribute given in their XML description. The IPlugin implementation must be exported and - made known to Qt's plugin system, see the Qt Documentation on the - \l{http://qt-project.org/doc/qt-4.8/qtplugin.html#Q_EXPORT_PLUGIN2} - {Q_EXPORT_PLUGIN2 macro}. + made known to Qt's plugin system, using the \c Q_PLUGIN_METADATA macro with + an IID set to \c "org.qt-project.Qt.QtCreatorPlugin". + After the plugins' XML files have been read, and dependencies have been found, the plugin loading is done in three phases: diff --git a/src/libs/extensionsystem/iplugin.h b/src/libs/extensionsystem/iplugin.h index fc7b14b1af6..5b8a852e00f 100644 --- a/src/libs/extensionsystem/iplugin.h +++ b/src/libs/extensionsystem/iplugin.h @@ -33,9 +33,7 @@ #include "extensionsystem_global.h" #include -#if QT_VERSION >= 0x050000 -# include -#endif +#include namespace ExtensionSystem { @@ -83,16 +81,4 @@ private: } // namespace ExtensionSystem -// The macros Q_EXPORT_PLUGIN, Q_EXPORT_PLUGIN2 become obsolete in Qt 5. -#if QT_VERSION >= 0x050000 -# if defined(Q_EXPORT_PLUGIN) -# undef Q_EXPORT_PLUGIN -# undef Q_EXPORT_PLUGIN2 -# endif -# define Q_EXPORT_PLUGIN(plugin) -# define Q_EXPORT_PLUGIN2(function, plugin) -#else -# define Q_PLUGIN_METADATA(x) -#endif - #endif // IPLUGIN_H diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index ac50369b323..7477cc3b494 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -90,7 +90,8 @@ enum { debugLeaks = 0 }; \section1 Plugins Plugins consist of an XML descriptor file, and of a library that contains a Qt plugin - (declared via Q_EXPORT_PLUGIN) that must derive from the IPlugin class. + that must derive from the IPlugin class and has an IID of + \c "org.qt-project.Qt.QtCreatorPlugin". The plugin manager is used to set a list of file system directories to search for plugins, retrieve information about the state of these plugins, and to load them. diff --git a/src/plugins/analyzerbase/analyzerplugin.cpp b/src/plugins/analyzerbase/analyzerplugin.cpp index d069392d633..b88147382e5 100644 --- a/src/plugins/analyzerbase/analyzerplugin.cpp +++ b/src/plugins/analyzerbase/analyzerplugin.cpp @@ -81,5 +81,3 @@ AnalyzerPlugin *AnalyzerPlugin::instance() { return m_instance; } - -Q_EXPORT_PLUGIN(AnalyzerPlugin) diff --git a/src/plugins/android/androidplugin.cpp b/src/plugins/android/androidplugin.cpp index 6f54dbdd94c..7410f81f5ae 100644 --- a/src/plugins/android/androidplugin.cpp +++ b/src/plugins/android/androidplugin.cpp @@ -124,5 +124,3 @@ void AndroidPlugin::updateDevice() } } // namespace Android - -Q_EXPORT_PLUGIN(Android::AndroidPlugin) diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp index 109f262033f..bd3056c822d 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp @@ -70,5 +70,3 @@ bool AutotoolsProjectPlugin::initialize(const QStringList &arguments, return true; } - -Q_EXPORT_PLUGIN(AutotoolsProjectPlugin) diff --git a/src/plugins/baremetal/baremetalplugin.cpp b/src/plugins/baremetal/baremetalplugin.cpp index 12f9c42e1f9..3fe0f025374 100644 --- a/src/plugins/baremetal/baremetalplugin.cpp +++ b/src/plugins/baremetal/baremetalplugin.cpp @@ -73,5 +73,3 @@ bool BareMetalPlugin::initialize(const QStringList &arguments, QString *errorStr } // namespace Internal } // namespace BareMetal -Q_EXPORT_PLUGIN(BareMetal::Internal::BareMetalPlugin) - diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 93ba0a7eaf1..079eaec1941 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -784,5 +784,3 @@ void BazaarPlugin::updateActions(VcsBase::VcsBasePlugin::ActionState as) } // namespace Internal } // namespace Bazaar - -Q_EXPORT_PLUGIN(Bazaar::Internal::BazaarPlugin) diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp index f0a21aa89ad..ba2b0c3a144 100644 --- a/src/plugins/beautifier/beautifierplugin.cpp +++ b/src/plugins/beautifier/beautifierplugin.cpp @@ -422,5 +422,3 @@ QString BeautifierPlugin::msgCommandPromptDialogTitle(const QString &command) } // namespace Internal } // namespace Beautifier - -Q_EXPORT_PLUGIN(Beautifier::Internal::BeautifierPlugin) diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp index d1ae439c2eb..86bb0fe1416 100644 --- a/src/plugins/bineditor/bineditorplugin.cpp +++ b/src/plugins/bineditor/bineditorplugin.cpp @@ -559,6 +559,4 @@ void BinEditorPlugin::selectAllAction() } // namespace Internal } // namespace BinEditor -Q_EXPORT_PLUGIN(BinEditor::Internal::BinEditorPlugin) - #include "bineditorplugin.moc" diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index d1423a0335f..8187492cd1f 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/src/plugins/bookmarks/bookmarksplugin.cpp @@ -202,5 +202,3 @@ void BookmarksPlugin::editBookmarkActionTriggered() { m_bookmarkManager->edit(m_bookmarkMarginActionFileName, m_bookmarkMarginActionLineNumber); } - -Q_EXPORT_PLUGIN(BookmarksPlugin) diff --git a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp index 57e94003c20..40ed8725c9b 100644 --- a/src/plugins/clangcodemodel/clangcodemodelplugin.cpp +++ b/src/plugins/clangcodemodel/clangcodemodelplugin.cpp @@ -90,5 +90,3 @@ void ClangCodeModelPlugin::extensionsInitialized() } // namespace Internal } // namespace Clang - -Q_EXPORT_PLUGIN(ClangCodeModel::Internal::ClangCodeModelPlugin) diff --git a/src/plugins/classview/classviewplugin.cpp b/src/plugins/classview/classviewplugin.cpp index 517ae0cc1b2..f131b53058a 100644 --- a/src/plugins/classview/classviewplugin.cpp +++ b/src/plugins/classview/classviewplugin.cpp @@ -62,5 +62,3 @@ bool Plugin::initialize(const QStringList &arguments, QString *errorMessage) } // namespace Internal } // namespace ClassView - -Q_EXPORT_PLUGIN(ClassView::Internal::Plugin) diff --git a/src/plugins/clearcase/clearcaseplugin.cpp b/src/plugins/clearcase/clearcaseplugin.cpp index 732e4465d56..93c27b2ee9a 100644 --- a/src/plugins/clearcase/clearcaseplugin.cpp +++ b/src/plugins/clearcase/clearcaseplugin.cpp @@ -2480,5 +2480,3 @@ void ClearCasePlugin::testVcsStatusDynamicNotManaged() } // namespace Internal } // namespace ClearCase - -Q_EXPORT_PLUGIN(ClearCase::Internal::ClearCasePlugin) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index 573dd98ed2f..713232848c8 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -76,5 +76,3 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString * void CMakeProjectPlugin::extensionsInitialized() { } - -Q_EXPORT_PLUGIN(CMakeProjectPlugin) diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 8a99a4b2fde..f60c60f0342 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -151,5 +151,3 @@ ExtensionSystem::IPlugin::ShutdownFlag CorePlugin::aboutToShutdown() m_mainWindow->aboutToShutdown(); return SynchronousShutdown; } - -Q_EXPORT_PLUGIN(CorePlugin) diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index 605a2176d1e..bb5eb7922da 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -390,5 +390,3 @@ CodepasterPlugin *CodepasterPlugin::instance() } } // namespace CodePaster - -Q_EXPORT_PLUGIN(CodePaster::CodepasterPlugin) diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index f9d3c71a78c..e78a0b9549e 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/src/plugins/cppeditor/cppeditorplugin.cpp @@ -425,5 +425,3 @@ void CppEditorPlugin::openIncludeHierarchy() emit includeHierarchyRequested(); } } - -Q_EXPORT_PLUGIN(CppEditorPlugin) diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp index d214c6055fd..0133174fe11 100644 --- a/src/plugins/cpptools/cpptoolsplugin.cpp +++ b/src/plugins/cpptools/cpptoolsplugin.cpp @@ -449,5 +449,3 @@ QString correspondingHeaderOrSource(const QString &fileName, bool *wasHeader) } } // namespace CppTools - -Q_EXPORT_PLUGIN(CppTools::Internal::CppToolsPlugin) diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 386a8087b9f..9bb02a65810 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -1355,5 +1355,3 @@ void CvsPlugin::testLogResolving() } // namespace Internal } // namespace Cvs - -Q_EXPORT_PLUGIN(Cvs::Internal::CvsPlugin) diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index 77531a3ff52..17c538996bd 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -3697,5 +3697,3 @@ void DebuggerPluginPrivate::testBenchmark1() } // namespace Debugger #include "debuggerplugin.moc" - -Q_EXPORT_PLUGIN(Debugger::DebuggerPlugin) diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index c4d284a2671..2988888101a 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -200,5 +200,3 @@ void FormEditorPlugin::switchSourceForm() if (!fileToOpen.isEmpty()) Core::EditorManager::openEditor(fileToOpen); } - -Q_EXPORT_PLUGIN(FormEditorPlugin) diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 63a29d985e1..6b5eb9e24de 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -863,7 +863,4 @@ void DiffEditor::Internal::DiffEditorPlugin::testReadPatch() #endif // WITH_TESTS - -Q_EXPORT_PLUGIN(DiffEditor::Internal::DiffEditorPlugin) - #include "diffeditorplugin.moc" diff --git a/src/plugins/emacskeys/emacskeysplugin.cpp b/src/plugins/emacskeys/emacskeysplugin.cpp index 66b80c006ec..2b173b59f57 100644 --- a/src/plugins/emacskeys/emacskeysplugin.cpp +++ b/src/plugins/emacskeys/emacskeysplugin.cpp @@ -386,5 +386,3 @@ void EmacsKeysPlugin::genericVScroll(int direction) m_currentEditorWidget->setTextCursor(cursor); m_currentState->endOwnAction(KeysActionOther); } - -Q_EXPORT_PLUGIN2(EmacsKeys, EmacsKeysPlugin) diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index a2d4cb87937..c39a4587f81 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -2319,5 +2319,3 @@ void FakeVimPlugin::setupTest(QString *title, FakeVimHandler **handler, QWidget } // namespace FakeVim #include "fakevimplugin.moc" - -Q_EXPORT_PLUGIN(FakeVim::Internal::FakeVimPlugin) diff --git a/src/plugins/genericprojectmanager/genericprojectplugin.cpp b/src/plugins/genericprojectmanager/genericprojectplugin.cpp index 8de935963e0..460a781b3b9 100644 --- a/src/plugins/genericprojectmanager/genericprojectplugin.cpp +++ b/src/plugins/genericprojectmanager/genericprojectplugin.cpp @@ -101,5 +101,3 @@ void GenericProjectPlugin::editFiles() } // namespace Internal } // namespace GenericProjectManager - -Q_EXPORT_PLUGIN(GenericProjectManager::Internal::GenericProjectPlugin) diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 98e1313d52f..e9e099fd31d 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1582,5 +1582,3 @@ void GitPlugin::testCloneWizard_directoryFromRepository_data() } // namespace Internal } // namespace Git - -Q_EXPORT_PLUGIN(GitPlugin) diff --git a/src/plugins/glsleditor/glsleditorplugin.cpp b/src/plugins/glsleditor/glsleditorplugin.cpp index 2973c0a5bc9..6cc286f863a 100644 --- a/src/plugins/glsleditor/glsleditorplugin.cpp +++ b/src/plugins/glsleditor/glsleditorplugin.cpp @@ -288,5 +288,3 @@ const GlslEditorPlugin::InitFile *GlslEditorPlugin::shaderInit(int variant) } // namespace Internal } // namespace GlslEditor - -Q_EXPORT_PLUGIN(GlslEditor::Internal::GlslEditorPlugin) diff --git a/src/plugins/helloworld/helloworldplugin.cpp b/src/plugins/helloworld/helloworldplugin.cpp index 50ec3b1fc31..bb38692de23 100644 --- a/src/plugins/helloworld/helloworldplugin.cpp +++ b/src/plugins/helloworld/helloworldplugin.cpp @@ -153,5 +153,3 @@ void HelloWorldPlugin::sayHelloWorld() } // namespace Internal } // namespace HelloWorld - -Q_EXPORT_PLUGIN(HelloWorld::Internal::HelloWorldPlugin) diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index 3203e2c69e3..5d0f9fdcfa1 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -1054,5 +1054,3 @@ void HelpPlugin::setupNavigationMenus(QAction *back, QAction *next, QWidget *par back->setMenu(m_backMenu); next->setMenu(m_nextMenu); } - -Q_EXPORT_PLUGIN(HelpPlugin) diff --git a/src/plugins/imageviewer/imageviewerplugin.cpp b/src/plugins/imageviewer/imageviewerplugin.cpp index 56e5d1ae8b5..655ba959fa0 100644 --- a/src/plugins/imageviewer/imageviewerplugin.cpp +++ b/src/plugins/imageviewer/imageviewerplugin.cpp @@ -63,5 +63,3 @@ void ImageViewerPlugin::extensionsInitialized() } // namespace Internal } // namespace ImageViewer - -Q_EXPORT_PLUGIN(ImageViewer::Internal::ImageViewerPlugin) diff --git a/src/plugins/ios/iosplugin.cpp b/src/plugins/ios/iosplugin.cpp index b039fa58797..18c5b016359 100644 --- a/src/plugins/ios/iosplugin.cpp +++ b/src/plugins/ios/iosplugin.cpp @@ -100,5 +100,3 @@ void IosPlugin::kitsRestored() } } // namespace Ios - -Q_EXPORT_PLUGIN(Ios::IosPlugin) diff --git a/src/plugins/macros/macrosplugin.cpp b/src/plugins/macros/macrosplugin.cpp index a672e592cd2..4e1aea56012 100644 --- a/src/plugins/macros/macrosplugin.cpp +++ b/src/plugins/macros/macrosplugin.cpp @@ -112,5 +112,3 @@ bool MacrosPlugin::initialize(const QStringList &arguments, QString *errorMessag void MacrosPlugin::extensionsInitialized() { } - -Q_EXPORT_PLUGIN(MacrosPlugin) diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 6e0524bda09..0af95bb9ec8 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -756,5 +756,3 @@ void MercurialPlugin::testLogResolving() } // namespace Internal } // namespace Mercurial - -Q_EXPORT_PLUGIN(MercurialPlugin) diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index db981564345..79f69852bdb 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -1567,6 +1567,4 @@ void PerforcePlugin::testLogResolving() } // namespace Internal } // namespace Perforce -Q_EXPORT_PLUGIN(Perforce::Internal::PerforcePlugin) - #include "perforceplugin.moc" diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index ab890012e77..be4fa58ddf4 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -3236,5 +3236,3 @@ QList > ProjectExplorerPlugin::recentProjects() { return d->m_recentProjects; } - -Q_EXPORT_PLUGIN(ProjectExplorerPlugin) diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp index b3fef6c017d..751c11c2327 100644 --- a/src/plugins/pythoneditor/pythoneditorplugin.cpp +++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp @@ -253,5 +253,3 @@ QSet PythonEditorPlugin::builtins() } // namespace Internal } // namespace PythonEditor - -Q_EXPORT_PLUGIN(PythonEditor::Internal::PythonEditorPlugin) diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index b796b010f68..7229faa73dd 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -515,5 +515,3 @@ void QbsProjectManagerPlugin::reparseProject(QbsProject *project) } // namespace Internal } // namespace QbsProjectManager - -Q_EXPORT_PLUGIN(QbsProjectManager::Internal::QbsProjectManagerPlugin) diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp index d0dc3cf4e65..d864a9bf97d 100644 --- a/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp +++ b/src/plugins/qmakeandroidsupport/qmakeandroidsupportplugin.cpp @@ -66,5 +66,3 @@ bool QmakeAndroidSupportPlugin::initialize(const QStringList &arguments, QString void QmakeAndroidSupportPlugin::extensionsInitialized() { } - -Q_EXPORT_PLUGIN(QmakeAndroidSupportPlugin) diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp index 688a9fefee7..00be7fd3651 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectmanagerplugin.cpp @@ -421,5 +421,3 @@ void QmakeProjectManagerPlugin::updateBuildFileAction() m_buildFileAction->setVisible(visible); m_buildFileAction->setEnabled(enabled); } - -Q_EXPORT_PLUGIN(QmakeProjectManagerPlugin) diff --git a/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp b/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp index 81b7f605067..2b38bd30cf0 100644 --- a/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp +++ b/src/plugins/qmldesigner/componentsplugin/componentsplugin.cpp @@ -58,7 +58,3 @@ QString ComponentsPlugin::metaInfo() const } -#if QT_VERSION < 0x050000 -Q_EXPORT_PLUGIN(QmlDesigner::ComponentsPlugin) -#endif - diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 2c846eb851d..6049f997055 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -512,5 +512,3 @@ void QmlDesignerPlugin::setSettings(const DesignerSettings &s) } } - -Q_EXPORT_PLUGIN(QmlDesigner::QmlDesignerPlugin) diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp index 3fdfabc3e82..7a6b10faa66 100644 --- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp +++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp @@ -50,7 +50,3 @@ QString QtQuickPlugin::metaInfo() const } -#if QT_VERSION < 0x050000 -Q_EXPORT_PLUGIN(QmlDesigner::QtQuickPlugin) -#endif - diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index f5c35180e05..4651bfe584b 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -341,5 +341,3 @@ void QmlJSEditorPlugin::checkCurrentEditorSemanticInfoUpToDate() } } // namespace QmlJSEditor - -Q_EXPORT_PLUGIN(QmlJSEditor::Internal::QmlJSEditorPlugin) diff --git a/src/plugins/qmljstools/qmljstoolsplugin.cpp b/src/plugins/qmljstools/qmljstoolsplugin.cpp index 056a1585d39..59faf793e8e 100644 --- a/src/plugins/qmljstools/qmljstoolsplugin.cpp +++ b/src/plugins/qmljstools/qmljstoolsplugin.cpp @@ -140,5 +140,3 @@ void QmlJSToolsPlugin::onAllTasksFinished(Core::Id type) if (type == QmlJS::Constants::TASK_INDEX) m_resetCodeModelAction->setEnabled(true); } - -Q_EXPORT_PLUGIN(QmlJSToolsPlugin) diff --git a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp index 0a636919cfd..73da18d531d 100644 --- a/src/plugins/qmlprofiler/qmlprofilerplugin.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerplugin.cpp @@ -109,5 +109,3 @@ QList QmlProfilerPlugin::getModels() const } // namespace Internal } // namespace QmlProfiler - -Q_EXPORT_PLUGIN(QmlProfiler::Internal::QmlProfilerPlugin) diff --git a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp index 6f24bd089e7..38d59971864 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectplugin.cpp @@ -77,5 +77,3 @@ void QmlProjectPlugin::extensionsInitialized() } } // namespace QmlProjectManager - -Q_EXPORT_PLUGIN(QmlProjectManager::QmlProjectPlugin) diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index 00a6e45aed4..b31e2229c2e 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -533,5 +533,3 @@ void QnxPlugin::testConfigurationManager() } #endif - -Q_EXPORT_PLUGIN2(QNX, QnxPlugin) diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index d275985c09e..419ac2d9ee4 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -127,5 +127,3 @@ bool QtSupportPlugin::delayedInitialize() { return QtVersionManager::delayedInitialize(); } - -Q_EXPORT_PLUGIN(QtSupportPlugin) diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp index 0a7db2a423d..85541afc8a3 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.cpp +++ b/src/plugins/remotelinux/remotelinuxplugin.cpp @@ -75,5 +75,3 @@ void RemoteLinuxPlugin::extensionsInitialized() } // namespace Internal } // namespace RemoteLinux - -Q_EXPORT_PLUGIN(RemoteLinux::Internal::RemoteLinuxPlugin) diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index 75fce8a13d0..4de1f9d0651 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp @@ -377,6 +377,4 @@ ResourceEditorW * ResourceEditorPlugin::currentEditor() const return focusEditor; } -Q_EXPORT_PLUGIN(ResourceEditorPlugin) - #include "resourceeditorplugin.moc" diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 8c938bb80a3..de9df00db69 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -1315,5 +1315,3 @@ void SubversionPlugin::testLogResolving() } // Internal } // Subversion -Q_EXPORT_PLUGIN(Subversion::Internal::SubversionPlugin) - diff --git a/src/plugins/tasklist/tasklistplugin.cpp b/src/plugins/tasklist/tasklistplugin.cpp index 2b25630c4f6..48ab954800b 100644 --- a/src/plugins/tasklist/tasklistplugin.cpp +++ b/src/plugins/tasklist/tasklistplugin.cpp @@ -261,5 +261,3 @@ void TaskListPlugin::loadDataFromSession() } // namespace Internal } // namespace TaskList - -Q_EXPORT_PLUGIN(TaskList::Internal::TaskListPlugin) diff --git a/src/plugins/texteditor/texteditorplugin.cpp b/src/plugins/texteditor/texteditorplugin.cpp index 4dc946e3b4d..f03dfac192c 100644 --- a/src/plugins/texteditor/texteditorplugin.cpp +++ b/src/plugins/texteditor/texteditorplugin.cpp @@ -322,6 +322,4 @@ void TextEditorPlugin::updateCurrentSelection(const QString &text) } } -Q_EXPORT_PLUGIN(TextEditorPlugin) - #include "texteditorplugin.moc" diff --git a/src/plugins/todo/todoplugin.cpp b/src/plugins/todo/todoplugin.cpp index a495dc09ee9..84a1a2b1852 100755 --- a/src/plugins/todo/todoplugin.cpp +++ b/src/plugins/todo/todoplugin.cpp @@ -124,7 +124,5 @@ void TodoPlugin::createOptionsPage() connect(m_optionsPage, SIGNAL(settingsChanged(Settings)), SLOT(settingsChanged(Settings))); } -Q_EXPORT_PLUGIN2(Todo, TodoPlugin) - } // namespace Internal } // namespace Todo diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index fc8c30f8018..9e124b72ced 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -278,5 +278,3 @@ void UpdateInfoPlugin::settingsHelper(T *settings) } //namespace Internal } //namespace UpdateInfo - -Q_EXPORT_PLUGIN(UpdateInfo::Internal::UpdateInfoPlugin) diff --git a/src/plugins/valgrind/valgrindplugin.cpp b/src/plugins/valgrind/valgrindplugin.cpp index 630eb0931b8..ea3ef940f4c 100644 --- a/src/plugins/valgrind/valgrindplugin.cpp +++ b/src/plugins/valgrind/valgrindplugin.cpp @@ -199,5 +199,3 @@ void ValgrindPlugin::extensionsInitialized() } // namespace Internal } // namespace Valgrind - -Q_EXPORT_PLUGIN(Valgrind::Internal::ValgrindPlugin) diff --git a/src/plugins/vcsbase/vcsplugin.cpp b/src/plugins/vcsbase/vcsplugin.cpp index ca604bb6541..b849bbfb96f 100644 --- a/src/plugins/vcsbase/vcsplugin.cpp +++ b/src/plugins/vcsbase/vcsplugin.cpp @@ -163,5 +163,3 @@ void VcsPlugin::slotSettingsChanged() } // namespace Internal } // namespace VcsBase - -Q_EXPORT_PLUGIN(VcsBase::Internal::VcsPlugin) diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index f5b0b2d1467..3c254da518f 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -342,7 +342,4 @@ void WelcomePlugin::extensionsInitialized() } // namespace Internal } // namespace Welcome - -Q_EXPORT_PLUGIN(Welcome::Internal::WelcomePlugin) - #include "welcomeplugin.moc" diff --git a/src/plugins/winrt/winrtplugin.cpp b/src/plugins/winrt/winrtplugin.cpp index ac195f898a9..dcaf0840206 100644 --- a/src/plugins/winrt/winrtplugin.cpp +++ b/src/plugins/winrt/winrtplugin.cpp @@ -72,5 +72,3 @@ void WinRtPlugin::extensionsInitialized() } // namespace Internal } // namespace WinRt - -Q_EXPORT_PLUGIN(WinRt::Internal::WinRtPlugin) diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp index 34312fd8c40..968ff7cff4e 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin1/plugin1.cpp @@ -49,5 +49,3 @@ void MyPlugin1::extensionsInitialized() { } -Q_EXPORT_PLUGIN(MyPlugin1) - diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp index 12de9298052..fd3d1769f8c 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin2/plugin2.cpp @@ -46,5 +46,3 @@ void MyPlugin2::extensionsInitialized() { } -Q_EXPORT_PLUGIN(MyPlugin2) - diff --git a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp index 42153521883..f4c705270c7 100644 --- a/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp +++ b/tests/auto/extensionsystem/pluginmanager/circularplugins/plugin3/plugin3.cpp @@ -45,5 +45,3 @@ void MyPlugin3::extensionsInitialized() { } -Q_EXPORT_PLUGIN(MyPlugin3) - diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp index da9d7536dd7..e201884bddc 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin1/plugin1.cpp @@ -79,5 +79,3 @@ void MyPlugin1::extensionsInitialized() addAutoReleasedObject(obj); } -Q_EXPORT_PLUGIN(MyPlugin1) - diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp index 5860f58253f..3418c84b73a 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin2/plugin2.cpp @@ -61,5 +61,3 @@ void MyPlugin2::extensionsInitialized() addAutoReleasedObject(obj); } -Q_EXPORT_PLUGIN(MyPlugin2) - diff --git a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp index 48c8154ed43..acefa1b3b9b 100644 --- a/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp +++ b/tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin3/plugin3.cpp @@ -69,5 +69,3 @@ void MyPlugin3::extensionsInitialized() obj->setObjectName(QLatin1String("MyPlugin3_running")); addAutoReleasedObject(obj); } - -Q_EXPORT_PLUGIN(MyPlugin3) diff --git a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp index e1f8983365b..4e5a60ea486 100644 --- a/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp +++ b/tests/auto/extensionsystem/pluginspec/testplugin/testplugin.cpp @@ -49,5 +49,3 @@ void MyPluginImpl::extensionsInitialized() m_isExtensionsInitialized = true; } -Q_EXPORT_PLUGIN(MyPluginImpl) -