summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-28 16:50:34 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-28 16:50:34 (GMT)
commit9d636095403f5abecbdff8ffffe658f35ff10001 (patch)
treefda62cb14f16f3a8b92b5cd41dc972cac4a19ef6 /src/3rdparty/webkit
parentc69b74008c72b7e2da5ff4bc57112b89d0a36d7d (diff)
parentb383ff766764f4d0d9644ca06bfb049d62bdcf2f (diff)
downloadQt-9d636095403f5abecbdff8ffffe658f35ff10001.zip
Qt-9d636095403f5abecbdff8ffffe658f35ff10001.tar.gz
Qt-9d636095403f5abecbdff8ffffe658f35ff10001.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix a regression: icons with slightly wrong ICO header did not load. Fixed an endless loop if printing web pages. don't build unneeded QtDesigner parts on Windows CE Better support for user-generated binary shaders
Diffstat (limited to 'src/3rdparty/webkit')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
index 29bde0d..e4c2afc 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
@@ -1369,6 +1369,11 @@ void QWebFrame::print(QPrinter *printer) const
// paranoia check
fromPage = qMax(1, fromPage);
toPage = qMin(printContext.pageCount(), toPage);
+ if (toPage < fromPage) {
+ // if the user entered a page range outside the actual number
+ // of printable pages, just return
+ return;
+ }
if (printer->pageOrder() == QPrinter::LastPageFirst) {
int tmp = fromPage;