[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenox/konq-embed/kdesrc/khtml/patches
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-05-17 9:55:10
Message-ID: 1147859710.142592.30359.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 541785 by eva:

Qt2:
wrong pointer was used -> caused a crash when logging into 1&1 domain
account


 M  +7 -3      rendering_qt2.3.patch  


--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/rendering_qt2.3.patch #541784:541785
@@ -1492,7 +1492,7 @@
  #else
 -    return m_vBar->style().pixelMetric(QStyle::PM_ScrollBarExtent);
 +#if (QT_VERSION < 0x030000)
-+    return m_hBar->style().scrollBarExtent().width();
++    return m_vBar->style().scrollBarExtent().width();
 +#else
 +    return m_vBar->style().pixelMetric(QStyle::PM_ScrollBarExtent);
 +#endif
@@ -1512,13 +1512,17 @@
  #endif
  
  }
-@@ -615,7 +621,11 @@ void RenderLayer::positionScrollbars(con
+@@ -615,7 +621,15 @@ void RenderLayer::positionScrollbars(con
      QScrollBar *b = m_hBar;
      if (!m_hBar)
  	b = m_vBar;
 -    int sw = b->style().pixelMetric(QStyle::PM_ScrollBarExtent);
 +#if (QT_VERSION < 0x030000)
-+    int sw = m_hBar->style().scrollBarExtent().height();
++    int sw = 0;
++    if (m_hBar)
++        sw = m_hBar->style().scrollBarExtent().height();
++    else
++        sw = m_vBar->style().scrollBarExtent().width();
 +#else
 +    int sw = b->style().pixelMetric(QStyle::PM_ScrollBarExtent);
 +#endif
[prev in list] [next in list] [prev in thread] [next in thread]