[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6bb27075bd7b0f4043ea0b381d96d180733c84fd
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Dec 12 11:00:55 2010 +0000

    2010-12-12  Sam Magnuson  <smagnuso at gmail.com>
    
            Reviewed by Eric Seidel.
    
            [Qt] Compile with QT_NO_QUUID_STRING.
            https://bugs.webkit.org/show_bug.cgi?id=49745
    
            * platform/UUID.cpp:
            (WebCore::createCanonicalUUIDString):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index afc1bb0..9b94e75 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-12  Sam Magnuson  <smagnuso at gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt] Compile with QT_NO_QUUID_STRING.
+        https://bugs.webkit.org/show_bug.cgi?id=49745
+
+        * platform/UUID.cpp:
+        (WebCore::createCanonicalUUIDString):
+
 2010-12-12  Ragner Magalhaes  <ragner.magalhaes at openbossa.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/UUID.cpp b/WebCore/platform/UUID.cpp
index faad008..5c2e076 100644
--- a/WebCore/platform/UUID.cpp
+++ b/WebCore/platform/UUID.cpp
@@ -55,7 +55,7 @@ static const int uuidVersionIdentifierIndex = 14;
 
 String createCanonicalUUIDString()
 {
-#if PLATFORM(QT)
+#if PLATFORM(QT) && !defined(QT_NO_QUUID_STRING)
     QUuid uuid = QUuid::createUuid();
     String canonicalUuidStr = uuid.toString().mid(1, 36).toLower(); // remove opening and closing bracket and make it lower.
     ASSERT(canonicalUuidStr[uuidVersionIdentifierIndex] == uuidVersionRequired);

-- 
WebKit Debian packaging