web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use QT_VERSION for new features - typo; refs #160

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-09-20 11:43:34 +00:00
parent e5df2889af
commit 2cbec37718
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/qbrowserlib/settings.hxx
View File

@@ -62,12 +62,6 @@ namespace qbrowserlib {
_settingJavascriptCanAccessClipboard; _settingJavascriptCanAccessClipboard;
_attributes[QWebSettings::DeveloperExtrasEnabled] = _attributes[QWebSettings::DeveloperExtrasEnabled] =
_settingDeveloperExtrasEnabled; _settingDeveloperExtrasEnabled;
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
_attributes[QWebSettings::SpatialNavigationEnabled] =
_settingSpatialNavigationEnabled;
#else
_settingSpatialNavigationEnabled->hide();
#fi
_attributes[QWebSettings::LinksIncludedInFocusChain] = _attributes[QWebSettings::LinksIncludedInFocusChain] =
_settingLinksIncludedInFocusChain; _settingLinksIncludedInFocusChain;
_attributes[QWebSettings::ZoomTextOnly] = _attributes[QWebSettings::ZoomTextOnly] =
@@ -83,6 +77,8 @@ namespace qbrowserlib {
_attributes[QWebSettings::LocalContentCanAccessRemoteUrls] = _attributes[QWebSettings::LocalContentCanAccessRemoteUrls] =
_settingLocalContentCanAccessRemoteUrls; _settingLocalContentCanAccessRemoteUrls;
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0) #if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
_attributes[QWebSettings::SpatialNavigationEnabled] =
_settingSpatialNavigationEnabled;
_attributes[QWebSettings::LocalContentCanAccessFileUrls] = _attributes[QWebSettings::LocalContentCanAccessFileUrls] =
_settingLocalContentCanAccessFileUrls; _settingLocalContentCanAccessFileUrls;
_attributes[QWebSettings::AcceleratedCompositingEnabled] = _attributes[QWebSettings::AcceleratedCompositingEnabled] =
@@ -92,11 +88,12 @@ namespace qbrowserlib {
_attributes[QWebSettings::FrameFlatteningEnabled] = _attributes[QWebSettings::FrameFlatteningEnabled] =
_settingFrameFlatteningEnabled; _settingFrameFlatteningEnabled;
#else #else
_settingSpatialNavigationEnabled->hide();
_settingLocalContentCanAccessFileUrls->hide(); _settingLocalContentCanAccessFileUrls->hide();
_settingAcceleratedCompositingEnabled->hide(); _settingAcceleratedCompositingEnabled->hide();
_settingTiledBackingStoreEnabled->hide(); _settingTiledBackingStoreEnabled->hide();
_settingFrameFlatteningEnabled->hide(); _settingFrameFlatteningEnabled->hide();
#fi #endif
#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0) #if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
_attributes[QWebSettings::XSSAuditingEnabled] = _attributes[QWebSettings::XSSAuditingEnabled] =
_settingXSSAuditingEnabled; _settingXSSAuditingEnabled;
@@ -105,7 +102,7 @@ namespace qbrowserlib {
#else #else
_settingXSSAuditingEnabled->hide(); _settingXSSAuditingEnabled->hide();
_settingSiteSpecificQuirksEnabled->hide(); _settingSiteSpecificQuirksEnabled->hide();
#fi #endif
// CheckBoxes // CheckBoxes
_checkboxes["SaveWindowState"] = _checkboxes["SaveWindowState"] =