[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

hausmann at webkit.org hausmann at webkit.org
Thu Oct 29 20:38:03 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit a1ab25ddfd85169292de5ada56b3754ab4b66e23
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 2 08:21:16 2009 +0000

    use wtf/unicode/qt4/unicodeQt4.h for RVCT and WINSCW
    
    Relative includes don't work properly with WINSCW
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/wtf/unicode/Unicode.h b/JavaScriptCore/wtf/unicode/Unicode.h
index d59439d..7016a03 100644
--- a/JavaScriptCore/wtf/unicode/Unicode.h
+++ b/JavaScriptCore/wtf/unicode/Unicode.h
@@ -26,7 +26,11 @@
 #include <wtf/Assertions.h>
 
 #if USE(QT4_UNICODE)
+#if COMPILER(WINSCW) || COMPILER(RVCT)
+#include "wtf/unicode/qt4/UnicodeQt4.h"
+#else
 #include "qt4/UnicodeQt4.h"
+#endif
 #elif USE(ICU_UNICODE)
 #include <wtf/unicode/icu/UnicodeIcu.h>
 #elif USE(GLIB_UNICODE)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list