feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
hjk
2008-12-02 14:10:00 +01:00
parent f61e8672db 7d6f2bb45a
commit ff433b44ad
14 changed files with 41 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/coreplugin.cpp
View File

@@ -41,7 +41,7 @@
#include "fileiconprovider.h"
#include <QtCore/qplugin.h>
#ifdef QT_WEBKIT
#if !defined(QT_NO_WEBKIT)
#include <QtGui/QApplication>
#include <QtWebKit/QWebSettings>
#endif
@@ -75,7 +75,7 @@ bool CorePlugin::initialize(const QStringList & /*arguments*/, QString *error_me
m_pm = ExtensionSystem::PluginManager::instance();
const bool success = m_mainWindow->init(m_pm, error_message);
if (success) {
#ifdef QT_WEBKIT
#if !defined(QT_NO_WEBKIT)
QWebSettings *webSettings = QWebSettings::globalSettings();
const QFont applicationFont = QApplication::font();
webSettings->setFontFamily(QWebSettings::StandardFont, applicationFont.family());