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

[vestbo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 25bade1b76b8152de652841aedfbae3e865f4ea4
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 13:34:04 2010 +0000

    Use OS(MAC_OS_X) rather than PLATFORM(MAC) in TestControllerQt
    
    Reviewed by Andreas Kling.
    
    PLATFORM(MAC) is not defined for the Qt port, as it refers to
    the Mac-port, not the Mac OS X operating system.
    
    * WebKitTestRunner/qt/TestControllerQt.cpp:
    (WTR::isExistingLibrary):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71331 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5f1be94..de6ad2b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-04  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Use OS(MAC_OS_X) rather than PLATFORM(MAC) in TestControllerQt
+
+        PLATFORM(MAC) is not defined for the Qt port, as it refers to
+        the Mac-port, not the Mac OS X operating system.
+
+        * WebKitTestRunner/qt/TestControllerQt.cpp:
+        (WTR::isExistingLibrary):
+
 2010-11-04  Leonid Ebril  <leonid.ebril at nokia.com>
 
         Reviewed by Andreas Kling.
diff --git a/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp b/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
index 4845f71..d4de1ba 100644
--- a/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
+++ b/WebKitTools/WebKitTestRunner/qt/TestControllerQt.cpp
@@ -94,7 +94,7 @@ static bool isExistingLibrary(const QString& path)
 {
 #if OS(WINDOWS) || OS(SYMBIAN)
     const char* librarySuffixes[] = { ".dll" };
-#elif PLATFORM(MAC)
+#elif OS(MAC_OS_X)
     const char* librarySuffixes[] = { ".bundle", ".dylib", ".so" };
 #elif OS(UNIX)
     const char* librarySuffixes[] = { ".so" };

-- 
WebKit Debian packaging