diff options
author | Alessandro Portale <alessandro.portale@digia.com> | 2014-05-08 16:25:05 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@digia.com> | 2014-05-08 17:22:33 +0200 |
commit | f3833907dfda5bbdea981471bb69ad0573db9663 (patch) | |
tree | 7ed4e02c25a6943ff6fab4b27efce18eebc0f1c3 | |
parent | 6d192bd843eb1819807a22adf02ada80a70661cb (diff) | |
download | qt-creator-f3833907dfda5bbdea981471bb69ad0573db9663.tar.gz |
WelcomeScreen: Remove unneeded QQmlNetworkAccessManagerFactory
That was for rss support which had been removed ages ago.
Change-Id: I98eec132489713d208ac20d9744fec2e5570ee2b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
-rw-r--r-- | src/plugins/welcome/welcome.pro | 2 | ||||
-rw-r--r-- | src/plugins/welcome/welcomeplugin.cpp | 26 |
2 files changed, 1 insertions, 27 deletions
diff --git a/src/plugins/welcome/welcome.pro b/src/plugins/welcome/welcome.pro index 325478392b..2305e92300 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 88a7d569d1..6095cae059 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -35,34 +35,20 @@ #include <coreplugin/icore.h> #include <coreplugin/imode.h> #include <coreplugin/modemanager.h> -#include <coreplugin/editormanager/editormanager.h> -#include <coreplugin/dialogs/iwizard.h> - -#include <projectexplorer/projectexplorer.h> #include <utils/fileutils.h> #include <utils/hostosinfo.h> #include <utils/styledbar.h> #include <utils/iwelcomepage.h> -#include <utils/networkaccessmanager.h> -#include <QScrollArea> -#include <QDesktopServices> -#include <QPainter> #include <QVBoxLayout> #include <QMessageBox> -#include <QCoreApplication> #include <QDir> -#include <QSettings> -#include <QDebug> -#include <QUrl> -#include <QtPlugin> #include <QtQuick/QQuickView> #include <QtQml/QQmlContext> #include <QtQml/QQmlEngine> -#include <QtQml/QQmlNetworkAccessManagerFactory> 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<QObject*> 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"); |