[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit b028b646a8f0c6872f9fbe4911789f7fdbe8e47f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 10:03:25 2010 +0000

    2010-02-23  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] QtLauncher should not use internal JavaScriptCore and WebCore interfaces
            https://bugs.webkit.org/show_bug.cgi?id=35248
    
            * QtLauncher/QtLauncher.pro:
            * QtLauncher/utils.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55134 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 43830ff..e066519 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-23  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QtLauncher should not use internal JavaScriptCore and WebCore interfaces
+        https://bugs.webkit.org/show_bug.cgi?id=35248
+
+        * QtLauncher/QtLauncher.pro:
+        * QtLauncher/utils.h:
+
 2010-02-23  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/QtLauncher/QtLauncher.pro b/WebKitTools/QtLauncher/QtLauncher.pro
index 7dcc8e4..e448f69 100644
--- a/WebKitTools/QtLauncher/QtLauncher.pro
+++ b/WebKitTools/QtLauncher/QtLauncher.pro
@@ -24,8 +24,6 @@ DESTDIR = ../../bin
 
 include(../../WebKit.pri)
 
-INCLUDEPATH += ../../JavaScriptCore
-
 QT += network
 macx:QT+=xml
 QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
diff --git a/WebKitTools/QtLauncher/utils.h b/WebKitTools/QtLauncher/utils.h
index 9a16067..b67351e 100644
--- a/WebKitTools/QtLauncher/utils.h
+++ b/WebKitTools/QtLauncher/utils.h
@@ -28,10 +28,18 @@
 #ifndef utils_h
 #define utils_h
 
-#include <wtf/AlwaysInline.h>
-
 #include <QtCore>
 
+#ifndef NO_RETURN
+#if defined(__CC_ARM) || defined(__ARMCC__)
+#define NO_RETURN __declspec(noreturn)
+#elif defined(__GNUC__)
+#define NO_RETURN __attribute((__noreturn__))
+#else
+#define NO_RETURN
+#endif
+#endif
+
 // options handling
 QString takeOptionValue(QStringList* arguments, int index);
 QString formatKeys(QList<QString> keys);

-- 
WebKit Debian packaging