[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

gramps gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 05:44:58 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit a078231b66d1fb2b6394867c5efcf74fedb35376
Author: gramps <gramps at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 19 15:44:31 2001 +0000

    Added qRgba and rgb functions for KDE 2.2.1 compatibility
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@133 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/kwq/KWQColor.h b/WebCore/kwq/KWQColor.h
index e8de1f2..4aa32b3 100644
--- a/WebCore/kwq/KWQColor.h
+++ b/WebCore/kwq/KWQColor.h
@@ -34,6 +34,7 @@
 #include "qstring.h"
 
 QRgb qRgb(int r, int g, int b);
+QRgb qRgba(int r, int g, int b, int a);
 
 // class QColor ================================================================
 
@@ -67,6 +68,7 @@ public:
     int red() const;
     int green() const;
     int blue() const;
+    QRgb rgb() const;
     void setRgb(int,int,int);
     void setRgb(int);
 
diff --git a/WebCore/kwq/qt/qcolor.h b/WebCore/kwq/qt/qcolor.h
index e8de1f2..4aa32b3 100644
--- a/WebCore/kwq/qt/qcolor.h
+++ b/WebCore/kwq/qt/qcolor.h
@@ -34,6 +34,7 @@
 #include "qstring.h"
 
 QRgb qRgb(int r, int g, int b);
+QRgb qRgba(int r, int g, int b, int a);
 
 // class QColor ================================================================
 
@@ -67,6 +68,7 @@ public:
     int red() const;
     int green() const;
     int blue() const;
+    QRgb rgb() const;
     void setRgb(int,int,int);
     void setRgb(int);
 
diff --git a/WebCore/src/kwq/qt/qcolor.h b/WebCore/src/kwq/qt/qcolor.h
index e8de1f2..4aa32b3 100644
--- a/WebCore/src/kwq/qt/qcolor.h
+++ b/WebCore/src/kwq/qt/qcolor.h
@@ -34,6 +34,7 @@
 #include "qstring.h"
 
 QRgb qRgb(int r, int g, int b);
+QRgb qRgba(int r, int g, int b, int a);
 
 // class QColor ================================================================
 
@@ -67,6 +68,7 @@ public:
     int red() const;
     int green() const;
     int blue() const;
+    QRgb rgb() const;
     void setRgb(int,int,int);
     void setRgb(int);
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list