2 files changed, 10 insertions, 2 deletions
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index deef0985e0..144c2caebe 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -98,6 +98,11 @@ CppToolsPlugin::~CppToolsPlugin()
     delete CppModelManager::instance();
 }
 
+CppToolsPlugin *CppToolsPlugin::instance()
+{
+    return m_instance;
+}
+
 bool CppToolsPlugin::initialize(const QStringList &arguments, QString *error)
 {
     Q_UNUSED(arguments)
diff --git a/src/plugins/cpptools/cpptoolsplugin.h b/src/plugins/cpptools/cpptoolsplugin.h
index fcb4d417e3..d8490f2a14 100644
--- a/src/plugins/cpptools/cpptoolsplugin.h
+++ b/src/plugins/cpptools/cpptoolsplugin.h
@@ -59,7 +59,7 @@ namespace Internal {
 class CppModelManager;
 struct CppFileSettings;
 
-class CppToolsPlugin : public ExtensionSystem::IPlugin
+class CPPTOOLS_EXPORT CppToolsPlugin : public ExtensionSystem::IPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QtCreatorPlugin" FILE "CppTools.json")
@@ -68,14 +68,17 @@ public:
     CppToolsPlugin();
     ~CppToolsPlugin();
 
+    static CppToolsPlugin *instance();
+
     bool initialize(const QStringList &arguments, QString *errorMessage);
     void extensionsInitialized();
     ShutdownFlag aboutToShutdown();
 
-private slots:
+public slots:
     void switchHeaderSource();
     void switchHeaderSourceInNextSplit();
 
+private slots:
 #ifdef WITH_TESTS
     void test_codegen_public_in_empty_class();
     void test_codegen_public_in_nonempty_class();