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

List:       kde-commits
Subject:    kdenox/konq-embed/kdesrc/khtml/patches
From:       Dirk Mueller <mueller () kde ! org>
Date:       2006-03-21 10:15:33
Message-ID: 1142936133.637359.4069.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 520932 by mueller:

ok, so this was supposed to build against 3.5.1. 


 M  +2 -2      ecma_qt2.3.patch  
 M  +0 -11     xml_qt2.3.patch  


--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/ecma_qt2.3.patch #520931:520932
@@ -79,10 +79,10 @@
      if ( exec->interpreter()->compatMode() == Interpreter::NetscapeCompat ) {
 @@ -759,7 +761,9 @@ Value DOMTextEvent::getValueProperty(Exe
    case AltKey:
-     return Boolean(tevent->altKey());
+     return Boolean(tevent.checkModifier(Qt::AltButton));
    case MetaKey:
 +#if (QT_VERSION >= 0x030000)
-     return Boolean(tevent->metaKey());
+     return Boolean(tevent.checkModifier(Qt::MetaButton));
 +#endif
    default:
      kdDebug(6070) << "WARNING: Unhandled token in DOMTextEvent::getValueProperty : " << token << endl;
--- trunk/kdenox/konq-embed/kdesrc/khtml/patches/xml_qt2.3.patch #520931:520932
@@ -1,14 +1,3 @@
---- ./dom2_eventsimpl.h	
-+++ khtml/xml/dom2_eventsimpl.h	
-@@ -321,7 +321,7 @@
-   bool ctrlKey()  const { return m_modifier & Qt::ControlButton; }
-   bool shiftKey() const { return m_modifier & Qt::ShiftButton; }
-   bool altKey()   const { return m_modifier & Qt::AltButton; }
--  bool metaKey()  const { return m_modifier & Qt::MetaButton; }
-+  bool metaKey()  const { return false; }
- 
-   bool             inputGenerated() const { return m_virtKeyVal == 0; }
-   unsigned long    keyVal() const     { return m_keyVal; }
 --- ./dom2_eventsimpl.cpp	
 +++ khtml/xml/dom2_eventsimpl.cpp	
 @@ -794,8 +794,8 @@ MutationEventImpl::MutationEventImpl(Eve
[prev in list] [next in list] [prev in thread] [next in thread]