From f3833907dfda5bbdea981471bb69ad0573db9663 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 8 May 2014 16:25:05 +0200 Subject: [PATCH] WelcomeScreen: Remove unneeded QQmlNetworkAccessManagerFactory That was for rss support which had been removed ages ago. Change-Id: I98eec132489713d208ac20d9744fec2e5570ee2b Reviewed-by: Thomas Hartmann --- src/plugins/welcome/welcome.pro | 2 +- src/plugins/welcome/welcomeplugin.cpp | 26 -------------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro index 325478392be..2305e923000 100644 --- a/src/plugins/welcome/welcome.pro +++ b/src/plugins/welcome/welcome.pro @@ -1,4 +1,4 @@ -QT += network quick +QT += quick include(../../qtcreatorplugin.pri) diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 88a7d569d14..6095cae059a 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -35,34 +35,20 @@ #include #include #include -#include -#include - -#include #include #include #include #include -#include -#include -#include -#include #include #include -#include #include -#include -#include -#include -#include #include #include #include -#include enum { debug = 0 }; @@ -74,14 +60,6 @@ static const char currentPageSettingsKeyC[] = "WelcomeTab"; namespace Welcome { namespace Internal { -class NetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory -{ -public: - NetworkAccessManagerFactory(): QQmlNetworkAccessManagerFactory() {} - QNetworkAccessManager* create(QObject *parent) { return new Utils::NetworkAccessManager(parent); } -}; - - struct WelcomeModePrivate { @@ -128,13 +106,11 @@ private: QQuickView *m_welcomePage; QList m_pluginList; int m_activePlugin; - NetworkAccessManagerFactory *m_networkAccessManagerFactory; }; // --- WelcomeMode WelcomeMode::WelcomeMode() : m_activePlugin(0) - , m_networkAccessManagerFactory(new NetworkAccessManagerFactory) { setDisplayName(tr("Welcome")); QIcon qtLogo; @@ -192,7 +168,6 @@ WelcomeMode::~WelcomeMode() QSettings *settings = Core::ICore::settings(); settings->setValue(QLatin1String(currentPageSettingsKeyC), activePlugin()); delete m_modeWidget; - delete m_networkAccessManagerFactory; } #if QT_VERSION >= 0x050300 @@ -268,7 +243,6 @@ void WelcomeMode::initPlugins() engine->setImportPathList(importPathList); if (!debug) engine->setOutputWarningsToStandardError(false); - engine->setNetworkAccessManagerFactory(m_networkAccessManagerFactory); QString pluginPath = applicationDirPath(); if (HostOsInfo::isMacHost()) pluginPath += QLatin1String("/../PlugIns");