drop upstream patches

This commit is contained in:
Lukas Tinkl 2009-04-01 10:32:24 +00:00
parent de1a48202f
commit b5a97b5a35
2 changed files with 0 additions and 19 deletions

View File

@ -1,17 +0,0 @@
--- kdelibs/khtml/ecma/kjs_css.cpp 2009/02/07 18:21:18 922888
+++ 4.2/kdelibs/khtml/ecma/kjs_css.cpp 2009/03/09 14:38:22 937328
@@ -222,12 +222,12 @@
CSSStyleDeclarationImpl &styleDecl = *m_impl;
if (propertyName == "cssText") {
- styleDecl.setCssText(value->toString(exec).domString());
+ styleDecl.setCssText(valueToStringWithNullCheck(exec, value));
}
else {
bool pxSuffix;
QString prop = cssPropertyName(propertyName, &pxSuffix);
- QString propvalue = value->toString(exec).qstring();
+ QString propvalue = valueToStringWithNullCheck(exec, value).string();
if (pxSuffix)
propvalue += QLatin1String("px");

View File

@ -86,7 +86,6 @@ Patch25: kdelibs-4.2.0-gcc44-misc.patch
# upstream
# 4.2 branch
Patch100: kdelibs-4.2.1-css.patch
Patch101: kdelibs-4.2.1-encoding-qt45.patch
# 4.3 branch
@ -227,7 +226,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# upstream patches
# 4.2
%patch100 -p1 -b .css-style
%patch101 -p1 -b .encoding-qt45
# 4.3