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

List:       kde-commits
Subject:    kdenox/konq-embed
From:       Eva Brucherseifer <eva () kde ! org>
Date:       2006-03-29 14:36:46
Message-ID: 1143643006.456483.23660.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 523939 by eva:


- apply frames_scroller patch before any qt2 patches are applied 
- make the patch work for qte3 code


 M  +10 -8     kdesrc/khtml/patches/frames_scroller.patch  
 M  +5 -3      prepare_kde_src  


--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/frames_scroller.patch #523938:523939
@@ -14,17 +14,19 @@
  
  #ifdef DEBUG_LAYOUT
 
---- khtmlview.cpp	2006-01-04 11:54:04.000000000 +0100
-+++ khtmlview.cpp	2006-03-24 01:03:12.000000000 +0100
-@@ -768,8 +781,8 @@
+--- khtmlview.cpp.org	2006-03-29 16:29:24.000000000 +0200
++++ khtmlview.cpp	2006-03-29 16:34:18.000000000 +0200
+@@ -775,8 +775,13 @@
          if (document->isHTMLDocument()) {
               NodeImpl *body = static_cast<HTMLDocumentImpl*>(document)->body();
               if(body && body->renderer() && body->id() == ID_FRAMESET) {
--                 Qt3ScrollView::setVScrollBarMode(AlwaysOff);
--                 Qt3ScrollView::setHScrollBarMode(AlwaysOff);
-+                 Qt3ScrollView::setVScrollBarMode(AlwaysOn);
-+                 Qt3ScrollView::setHScrollBarMode(AlwaysOn);
++#ifdef KHTML_NO_SCROLLBARS
+                  QScrollView::setVScrollBarMode(AlwaysOff);
+                  QScrollView::setHScrollBarMode(AlwaysOff);
++#else
++                 QScrollView::setVScrollBarMode(AlwaysOn);
++                 QScrollView::setHScrollBarMode(AlwaysOn);
++#endif
                   body->renderer()->setNeedsLayout(true);
  //                  if (d->tooltip) {
  //                      delete d->tooltip;
-
--- trunk/kdenox/konq-embed/prepare_kde_src #523938:523939
@@ -451,6 +451,8 @@
                 patch -s -d ./kdesrc/khtml -p0  -i  patches/khtml_load_images_delayed_3.5.patch 
                 echo "*** applying khtml-improved-scrolling patch..."
                 patch -s -d ./kdesrc/khtml -p0  -i  patches/khtml_improved_scrolling_3.5.patch 
+		echo "*** applying frames-scrolling patch..."
+		patch -s -d ./kdesrc/khtml -p0 -i  patches/frames_scroller.patch
 		  ;;
 	*) echo "Unknown kdelibs version. Patches NOT applied.\n" ;;
   esac
@@ -516,13 +518,13 @@
     *) echo "Remove special dropins for qt/e 2.x.x (if available)"
 		perl -pi -e "s,KDE_USE_QT(2.3),KDE_USE_QT(3.1)," ../configure.in.in
 		cp ./../admin/acinclude.m4.in.org ./../admin/acinclude.m4.in
-		rm -f ./dropin/q*
+		rm -f ./dropin/qt3*
 		rm -f ./dropin/objectdeleter.*
+		rm -f ./dropin/q[a-s]*
+		rm -f ./dropin/q[u-z]*
 		cp ./dropin/Makefile.am.qt3 ./dropin/Makefile.am
 esac
 
-		echo "*** applying frames-scrolling patch..."
-		patch -s -d ./kdesrc/khtml -p0 -i  patches/frames_scroller.patch
  
 
 #echo "*** applying kcharset unicode patch ..."
[prev in list] [next in list] [prev in thread] [next in thread]