summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2009-11-17 22:56:58 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2009-11-17 22:56:58 (GMT)
commite22ca6088407987cb69ccd03f162b431d5c2bf99 (patch)
tree12bb1de5c59670ad2c966cea60b9fd4d28dead2e /src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
parentf2b02ed855f7149afca0cc2e046c09c54a2d4444 (diff)
parenta61adccf96a8ceefbf1150966adda3f6d226ec6d (diff)
downloadQt-e22ca6088407987cb69ccd03f162b431d5c2bf99.zip
Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.tar.gz
Qt-e22ca6088407987cb69ccd03f162b431d5c2bf99.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
index 3b6d1a7..50cf424 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
@@ -102,12 +102,6 @@ public:
void setDefaultTextEncoding(const QString &encoding);
QString defaultTextEncoding() const;
- void setPrintingMinimumShrinkFactor(float printingMinimumShrinkFactor);
- float printingMinimumShrinkFactor() const;
-
- void setPrintingMaximumShrinkFactor(float printingMaximimShrinkFactor);
- float printingMaximumShrinkFactor() const;
-
static void setIconDatabasePath(const QString &location);
static QString iconDatabasePath();
static void clearIconDatabase();