diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-22 18:17:50 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-22 18:22:31 +0200 |
commit | f48f23c89d96520c1701083ba8616f751830e93b (patch) | |
tree | 9a9eca60c19154342aa1a755bb8fad53cf0c5f74 /src/plugins/coreplugin/coreplugin.cpp | |
parent | b4245ac15ca58348bdbf58150ddd837e43c3a5f4 (diff) | |
download | qt-creator-f48f23c89d96520c1701083ba8616f751830e93b.tar.gz |
fully-fledged webkit-free welcome mode
pros:
- the non-webkit version is not castrated any more
- i18n should become simpler
- but need to make the buttons non-labels for optimal results
- if we introduce delayed loading of the help plugin, we would get
webkit loading out of the startup's critical path alltogether
cons:
- the page might be a bit harder to modify for some
Diffstat (limited to 'src/plugins/coreplugin/coreplugin.cpp')
-rw-r--r-- | src/plugins/coreplugin/coreplugin.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index e99f5b796b..512ceb01b7 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -38,10 +38,6 @@ #include <extensionsystem/pluginmanager.h> #include <QtCore/QtPlugin> -#if !defined(QT_NO_WEBKIT) -#include <QtGui/QApplication> -#include <QtWebKit/QWebSettings> -#endif using namespace Core::Internal; @@ -72,12 +68,6 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) Q_UNUSED(arguments); const bool success = m_mainWindow->init(errorMessage); if (success) { -#if !defined(QT_NO_WEBKIT) - QWebSettings *webSettings = QWebSettings::globalSettings(); - const QFont applicationFont = QApplication::font(); - webSettings->setFontFamily(QWebSettings::StandardFont, applicationFont.family()); - //webSettings->setFontSize(QWebSettings::DefaultFontSize, applicationFont.pointSize()); -#endif m_welcomeMode = new WelcomeMode; addObject(m_welcomeMode); |