[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 041e5e1ace83960170d7b0796ba2fc6ed95f8c18
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Feb 8 17:37:25 2010 +0000

    Build fix for Qt on Windows.
    
    Reviewed by Kenneth Rohde Christiansen.
    
    Don't use noreturn directly since it's a gcc attribute.
    Instead use the NO_RETURN macro from AlwaysInline.h
    
    * QtLauncher/QtLauncher.pro:
    * QtLauncher/utils.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54493 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b1f617c..035a0bc 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-08  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Build fix for Qt on Windows.
+
+        Don't use noreturn directly since it's a gcc attribute.
+        Instead use the NO_RETURN macro from AlwaysInline.h
+
+        * QtLauncher/QtLauncher.pro:
+        * QtLauncher/utils.h:
+
 2010-02-05  Chris Jerdonek  <cjerdonek at webkit.org>
 
         Reviewed by Shinichiro Hamaji.
diff --git a/WebKitTools/QtLauncher/QtLauncher.pro b/WebKitTools/QtLauncher/QtLauncher.pro
index e448f69..7dcc8e4 100644
--- a/WebKitTools/QtLauncher/QtLauncher.pro
+++ b/WebKitTools/QtLauncher/QtLauncher.pro
@@ -24,6 +24,8 @@ 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 d6bdc29..9a16067 100644
--- a/WebKitTools/QtLauncher/utils.h
+++ b/WebKitTools/QtLauncher/utils.h
@@ -28,6 +28,8 @@
 #ifndef utils_h
 #define utils_h
 
+#include <wtf/AlwaysInline.h>
+
 #include <QtCore>
 
 // options handling
@@ -35,7 +37,7 @@ QString takeOptionValue(QStringList* arguments, int index);
 QString formatKeys(QList<QString> keys);
 QList<QString> enumToKeys(const QMetaObject o, const QString& name, const QString& strip);
 
-void appQuit(int status, const QString& msg = QString()) __attribute__((noreturn));
+NO_RETURN void appQuit(int status, const QString& msg = QString());
 
 QUrl urlFromUserInput(const QString& input);
 

-- 
WebKit Debian packaging