For the keyDown binding use QStringList instead of QList<QString>. The former is...

registered metatype. Also print out critical messages in dumprendertree's qt message handler.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21752 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1dbdaceae5f3dfde54ada0c81a957517c0c6f8f6..8487897eb804529d67dc732330aa48d3a9d2bcca 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2007-05-25  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Zack.
+
+        For the keyDown binding use QStringList instead of QList<QString>. The former is a default
+        registered metatype. Also print out critical messages in dumprendertree's qt message handler.
+
+        * DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp:
+        * DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h:
+        * DumpRenderTree/DumpRenderTree.qtproj/main.cpp:
+
 2007-05-20  David Kilzer  <ddkilzer@webkit.org>
 
         Reviewed by Adam Roben.

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp
index 22fe04cc18d01e3412573b7b7d13663aea291544..de59e2573d2434ccb8e096f6f79ccd22563e0190 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.cpp
@@ -124,7 +124,7 @@ void EventSender::leapForward(int ms)
     qDebug() << "EventSender::leapForward" << ms;
 }
 
-void EventSender::keyDown(const QString &string, const QList<QString> &modifiers)
+void EventSender::keyDown(const QString &string, const QStringList &modifiers)
 {
     qDebug() << "EventSender::keyDown" << string << modifiers;
 }

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h
index 695b588071c8f330ab63a7e1c9260cc5611edcf7..8b0bec406f2bf055e9401103793e895bb9cf253a 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/jsobjects.h
@@ -76,7 +76,7 @@ public slots:
     void mouseUp();
     void mouseMoveTo(int x, int y);
     void leapForward(int ms);
-    void keyDown(const QString &string, const QList<QString> &modifiers);
+    void keyDown(const QString &string, const QStringList &modifiers);
 
 private:
     QPoint mousePos;

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/main.cpp b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/main.cpp
index c3c17fe51eab5b83ae4f1b0b13c449d950d20aee..848d02b88a1a5a7af349d7d19df2ac04ccc3bb15 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/main.cpp
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/main.cpp
@@ -42,8 +42,12 @@
 
 #include <signal.h>
 
-void messageHandler(QtMsgType, const char *)
+void messageHandler(QtMsgType type, const char *message)
 {
+    if (type == QtCriticalMsg) {
+        fprintf(stderr, "%s\n", message);
+        return;
+    }
     // do nothing
 }