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

Merge remote-tracking branch 'origin/2.6'

Browse Source
This commit is contained in:
Eike Ziller
2012-10-22 11:17:09 +02:00
parent 68a7861263 fbf6a8da75
commit 021b64b5df
48 changed files with 45114 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/help/help.pro
View File

@@ -4,7 +4,7 @@ TARGET = Help
QT += network
greaterThan(QT_MAJOR_VERSION, 4) {
QT += printsupport help
!isEmpty(QT.webkit.name): QT += webkit
!isEmpty(QT.webkitwidgets.name): QT += webkitwidgets
else: DEFINES += QT_NO_WEBKIT
} else {
CONFIG += help

2
src/plugins/help/helpviewer_qwv.cpp
View File

@@ -322,8 +322,6 @@ HelpViewer::HelpViewer(qreal zoom, QWidget *parent)
setAcceptDrops(false);
installEventFilter(this);
QWebSettings::globalSettings()->setAttribute(QWebSettings::JavaEnabled, true);
QWebSettings::globalSettings()->setAttribute(QWebSettings::PluginsEnabled, true);
QWebSettings::globalSettings()->setAttribute(QWebSettings::DnsPrefetchEnabled, true);
setPage(new HelpPage(this));