diff options
author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-10-07 15:38:11 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2013-10-08 11:13:16 +0200 |
commit | 647726fd5d1164aa9f3c713a37c9afe51c712c78 (patch) | |
tree | 5815baf295db106a7b1946d3bd613e64a2173077 /src | |
parent | dfaec0632ad38ec8a4da4de41e18467e7884709c (diff) | |
download | qt-creator-647726fd5d1164aa9f3c713a37c9afe51c712c78.tar.gz |
WelcomePage: remove getting started page
The getting started page is not part redesign, anymore.
Change-Id: Iec779d4fcf86f1800e17a5b7775698b64ce16555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/qtsupport/gettingstartedwelcomepage.cpp | 36 | ||||
-rw-r--r-- | src/plugins/qtsupport/gettingstartedwelcomepage.h | 18 | ||||
-rw-r--r-- | src/plugins/qtsupport/qtsupportplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/welcome/welcomeplugin.cpp | 4 |
4 files changed, 0 insertions, 60 deletions
diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 71286c838e..a514b0d3b0 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -205,42 +205,6 @@ private: QMutex m_mutex; }; -GettingStartedWelcomePage::GettingStartedWelcomePage() : m_engine(0) -{ - -} - -QUrl GettingStartedWelcomePage::pageLocation() const -{ - QString resourcePath = Core::ICore::resourcePath(); -#ifdef Q_OS_WIN - // normalize paths so QML doesn't freak out if it's wrongly capitalized on Windows - resourcePath = Utils::normalizePathName(resourcePath); -#endif - - return QUrl::fromLocalFile(resourcePath + QLatin1String("/welcomescreen/gettingstarted.qml")); -} - -QString GettingStartedWelcomePage::title() const -{ - return tr("Getting Started"); -} - -int GettingStartedWelcomePage::priority() const -{ - return 4; -} - -void GettingStartedWelcomePage::facilitateQml(QQmlEngine *engine) -{ - m_engine = engine; -} - -GettingStartedWelcomePage::Id GettingStartedWelcomePage::id() const -{ - return GettingStarted; -} - ExamplesWelcomePage::ExamplesWelcomePage() : m_engine(0), m_showExamples(false) { diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.h b/src/plugins/qtsupport/gettingstartedwelcomepage.h index 515cac9b5d..f18f290679 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.h +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.h @@ -43,24 +43,6 @@ namespace QtSupport { namespace Internal { class ExamplesListModel; -class GettingStartedWelcomePageWidget; - -class GettingStartedWelcomePage : public Utils::IWelcomePage -{ - Q_OBJECT - -public: - GettingStartedWelcomePage(); - QUrl pageLocation() const; - QString title() const; - int priority() const; - void facilitateQml(QQmlEngine *); - Id id() const; - -private: - QQmlEngine *m_engine; -}; - class ExamplesWelcomePage : public Utils::IWelcomePage { diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index 0813dd6949..7aae247e14 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -85,8 +85,6 @@ bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMes welcomePage = new ExamplesWelcomePage; addAutoReleasedObject(welcomePage); - GettingStartedWelcomePage *gettingStartedWelcomePage = new GettingStartedWelcomePage; - addAutoReleasedObject(gettingStartedWelcomePage); #endif addAutoReleasedObject(new CustomExecutableRunConfigurationFactory); diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index e35787ab95..6b0b3bce48 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -231,10 +231,6 @@ void WelcomeMode::initPlugins() QSettings *settings = Core::ICore::settings(); setActivePlugin(settings->value(QLatin1String(currentPageSettingsKeyC)).toInt()); - // TODO: re-enable reading from Settings when possible. See QTCREATORBUG-6803 - if (activePlugin() > 1) - setActivePlugin(1); - QQmlContext *ctx = m_welcomePage->rootContext(); ctx->setContextProperty(QLatin1String("welcomeMode"), this); |