diff -r a1f515018ac1 -r b39122337a00 ginebra2/ContentViews/GWebContentViewWidget.cpp --- a/ginebra2/ContentViews/GWebContentViewWidget.cpp Mon Jul 12 15:46:53 2010 -0400 +++ b/ginebra2/ContentViews/GWebContentViewWidget.cpp Fri Aug 06 17:23:08 2010 -0400 @@ -337,6 +337,11 @@ if ( m_dirtyZoomFactor != zoom ) { m_dirtyZoomFactor = zoom; + #if QT_VERSION < 0x040600 + page()->setFixedContentsSize(QSize(m_viewportWidth, m_viewportHeight/zoom)); + #else + page()->setPreferredContentsSize(QSize((int)m_viewportWidth, (int)m_viewportHeight/zoom)); + #endif } QGraphicsWebView::setZoomFactor( zoom ); @@ -693,13 +698,13 @@ } m_initialScale = qBound(m_minimumScale, m_initialScale, m_maximumScale); - -#if QT_VERSION < 0x040600 - page()->setFixedContentsSize(QSize(m_viewportWidth, m_viewportHeight)); -#else - page()->setPreferredContentsSize(QSize((int)m_viewportWidth, (int)m_viewportHeight)); -#endif - +#ifdef NO_RESIZE_ON_LOAD + #if QT_VERSION < 0x040600 + page()->setFixedContentsSize(QSize(m_viewportWidth, m_viewportHeight)); + #else + page()->setPreferredContentsSize(QSize((int)m_viewportWidth, (int)m_viewportHeight)); + #endif +#endif //NO_RESIZE_ON_LOAD #ifndef NO_RESIZE_ON_LOAD qreal zoomF = 0.0; QString str;