Move the IWelcomePage to the place it belongs.

src/libs/extensionsystem/extensionsystem.pro

@@ -19,16 +19,14 @@ HEADERS += pluginerrorview.h \
     pluginspec_p.h \
     pluginview.h \
     pluginview_p.h \
-    optionsparser.h \
-    iwelcomepage.h
+    optionsparser.h
 SOURCES += pluginerrorview.cpp \
     plugindetailsview.cpp \
     iplugin.cpp \
     pluginmanager.cpp \
     pluginspec.cpp \
     pluginview.cpp \
-    optionsparser.cpp \
-    iwelcomepage.cpp
+    optionsparser.cpp
 FORMS += pluginview.ui \
     pluginerrorview.ui \
     plugindetailsview.ui

src/libs/extensionsystem/iwelcomepage.cpp → src/libs/utils/iwelcomepage.cpp

 #include "iwelcomepage.h"
 
-using namespace ExtensionSystem;
+using namespace Utils;
 
 IWelcomePage::IWelcomePage()
 {
 
 }
+
+IWelcomePage::~IWelcomePage()
+{
+
+}

src/libs/extensionsystem/iwelcomepage.h → src/libs/utils/iwelcomepage.h

@@ -2,20 +2,21 @@
 #define IWELCOMEPAGE_H
 
 
-#include "extensionsystem_global.h"
+#include "utils_global.h"
 
 #include <QObject>
 
-namespace ExtensionSystem {
+namespace Utils {
 
 class IWelcomePagePrivate;
 
-class EXTENSIONSYSTEM_EXPORT IWelcomePage : public QObject
+class QTCREATOR_UTILS_EXPORT IWelcomePage : public QObject
 {
     Q_OBJECT
 
 public:
     IWelcomePage();
+    virtual ~IWelcomePage();
 
     virtual QWidget *page() = 0;
     virtual QString title() const = 0;

src/libs/utils/utils.pro

@@ -33,6 +33,7 @@ SOURCES += reloadpromptutils.cpp \
     styledbar.cpp \
     stylehelper.cpp \
     welcomemodetreewidget.cpp \
+    iwelcomepage.cpp \
     fancymainwindow.cpp \
     detailsbutton.cpp \
     detailswidget.cpp
@@ -76,6 +77,7 @@ HEADERS += utils_global.h \
     styledbar.h \
     stylehelper.h \
     welcomemodetreewidget.h \
+    iwelcomepage.h \
     fancymainwindow.h \
     detailsbutton.h \
     detailswidget.h

src/plugins/projectexplorer/projectwelcomepage.h

@@ -30,14 +30,14 @@
 #ifndef PROJECTWELCOMEPAGE_H
 #define PROJECTWELCOMEPAGE_H
 
-#include <extensionsystem/iwelcomepage.h>
+#include <utils/iwelcomepage.h>
 
 namespace ProjectExplorer {
 namespace Internal {
 
 class ProjectWelcomePageWidget;
 
-class ProjectWelcomePage : public ExtensionSystem::IWelcomePage
+class ProjectWelcomePage : public Utils::IWelcomePage
 {
     Q_OBJECT
 public:

src/plugins/qt4projectmanager/gettingstartedwelcomepage.h

@@ -30,14 +30,14 @@
 #ifndef GETTINGSTARTEDWELCOMEPLUGIN_H
 #define GETTINGSTARTEDWELCOMEPLUGIN_H
 
-#include <extensionsystem/iwelcomepage.h>
+#include <utils/iwelcomepage.h>
 
 namespace Qt4ProjectManager {
 namespace Internal {
 
 class GettingStartedWelcomePageWidget;
 
-class GettingStartedWelcomePage : public ExtensionSystem::IWelcomePage
+class GettingStartedWelcomePage : public Utils::IWelcomePage
 {
     Q_OBJECT
 public:

src/plugins/welcome/communitywelcomepage.h

@@ -32,14 +32,14 @@
 
 #include "welcome_global.h"
 
-#include <extensionsystem/iwelcomepage.h>
+#include <utils/iwelcomepage.h>
 
 namespace Welcome {
 namespace Internal {
 
 class CommunityWelcomePageWidget;
 
-class WELCOME_EXPORT CommunityWelcomePage : public ExtensionSystem::IWelcomePage
+class CommunityWelcomePage : public Utils::IWelcomePage
 {
     Q_OBJECT
 public:

src/plugins/welcome/welcome.pri

-include(coreplugin_dependencies.pri)
+include(welcome_dependencies.pri)
+
 LIBS *= -l$$qtLibraryTarget(Welcome)

src/plugins/welcome/welcome.pro

@@ -2,12 +2,13 @@ TEMPLATE = lib
 TARGET = Welcome
 QT += network
 include(../../qtcreatorplugin.pri)
-include(../../plugins/coreplugin/coreplugin.pri)
+include(welcome_dependencies.pri)
 HEADERS += welcomeplugin.h \
     welcomemode.h \
     rssfetcher.h \
     communitywelcomepagewidget.h \
-    communitywelcomepage.h
+    communitywelcomepage.h \
+    welcome_global.h
 SOURCES += welcomeplugin.cpp \
     welcomemode.cpp \
     rssfetcher.cpp \

src/plugins/welcome/welcome_dependencies.pri

+include(../../plugins/coreplugin/coreplugin.pri)
+include(../../libs/utils/utils.pri)

src/plugins/welcome/welcomemode.cpp

@@ -29,7 +29,6 @@
 
 #include "welcomemode.h"
 #include <extensionsystem/pluginmanager.h>
-#include <extensionsystem/iwelcomepage.h>
 
 #include <coreplugin/icore.h>
 #include <coreplugin/coreconstants.h>
@@ -39,6 +38,7 @@
 
 #include <utils/styledbar.h>
 #include <utils/welcomemodetreewidget.h>
+#include <utils/iwelcomepage.h>
 
 #include <QtGui/QMouseEvent>
 #include <QtGui/QScrollArea>
@@ -55,6 +55,7 @@
 #include "ui_welcomemode.h"
 
 using namespace ExtensionSystem;
+using namespace Utils;
 
 namespace Welcome {