[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c55b62ac90bda920301e503a5b12b99a36cb9ca1
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 12:33:25 2010 +0000

    [Qt] Make DumpRenderTree build on Windows
    
    Reviewed by Simon Hausmann.
    
    * WebKit.pro:
    
    WebKitTools:
    
    * DumpRenderTree/qt/DumpRenderTree.pro:
    * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
    * DumpRenderTree/qt/DumpRenderTreeQt.h:
    * DumpRenderTree/qt/main.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53543 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 36d8daf..6b0e084 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-20  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Make DumpRenderTree build on Windows
+
+        * WebKit.pro:
+
 2010-01-20  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit.pro b/WebKit.pro
index 84e77ca..9b5d250 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -12,8 +12,9 @@ SUBDIRS += \
 !CONFIG(standalone_package) {
     SUBDIRS += JavaScriptCore/jsc.pro
 
+    !symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+
     !win32:!symbian {
-        SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
         SUBDIRS += WebKitTools/DumpRenderTree/qt/ImageDiff.pro
         SUBDIRS += WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
     }
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index adaa218..955301d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-20  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Make DumpRenderTree build on Windows
+
+        * DumpRenderTree/qt/DumpRenderTree.pro:
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        * DumpRenderTree/qt/DumpRenderTreeQt.h:
+        * DumpRenderTree/qt/main.cpp:
+
 2010-01-20  Steve Block  <steveblock at google.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
index 0c3281b..4487044 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
@@ -17,8 +17,10 @@ INCLUDEPATH += ../../../JavaScriptCore/ForwardingHeaders
 INCLUDEPATH += $$BASEDIR
 DESTDIR = ../../../bin
 
-CONFIG += link_pkgconfig
-PKGCONFIG += fontconfig
+!win32 {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += fontconfig
+}
 
 QT = core gui network testlib
 macx: QT += xml
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
index 37ff6c0..88af665 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
@@ -67,7 +67,10 @@
 
 #include <limits.h>
 
+#ifndef Q_OS_WIN
 #include <unistd.h>
+#endif
+
 #include <qdebug.h>
 
 extern void qt_drt_run(bool b);
@@ -87,13 +90,13 @@ const unsigned int maxViewHeight = 600;
 NetworkAccessManager::NetworkAccessManager(QObject* parent)
     : QNetworkAccessManager(parent)
 {
-#ifndef QT_NO_SSL
+#ifndef QT_NO_OPENSSL
     connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
             this, SLOT(sslErrorsEncountered(QNetworkReply*, const QList<QSslError>&)));
 #endif
 }
 
-#ifndef QT_NO_SSL
+#ifndef QT_NO_OPENSSL
 void NetworkAccessManager::sslErrorsEncountered(QNetworkReply* reply, const QList<QSslError>& errors)
 {
     if (reply->url().host() == "127.0.0.1" || reply->url().host() == "localhost") {
diff --git a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
index bc63ca5..9c3428b 100644
--- a/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
+++ b/WebKitTools/DumpRenderTree/qt/DumpRenderTreeQt.h
@@ -36,7 +36,7 @@
 #include <QTextStream>
 #include <QSocketNotifier>
 
-#ifndef QT_NO_SSL
+#ifndef QT_NO_OPENSSL
 #include <QSslError>
 #endif
 
@@ -142,7 +142,7 @@ public:
     NetworkAccessManager(QObject* parent);
 
 private slots:
-#ifndef QT_NO_SSL
+#ifndef QT_NO_OPENSSL
     void sslErrorsEncountered(QNetworkReply*, const QList<QSslError>&);
 #endif
 };
diff --git a/WebKitTools/DumpRenderTree/qt/main.cpp b/WebKitTools/DumpRenderTree/qt/main.cpp
index 768ceb4..69d3c23 100644
--- a/WebKitTools/DumpRenderTree/qt/main.cpp
+++ b/WebKitTools/DumpRenderTree/qt/main.cpp
@@ -90,12 +90,14 @@ QString get_backtrace() {
     return s;
 }
 
+#ifndef Q_OS_WIN
 static NO_RETURN void crashHandler(int sig)
 {
     fprintf(stderr, "%s\n", strsignal(sig));
     fprintf(stderr, "%s\n", get_backtrace().toLatin1().constData());
     exit(128 + sig);
 }
+#endif
 
 int main(int argc, char* argv[])
 {
@@ -122,6 +124,7 @@ int main(int argc, char* argv[])
     QX11Info::setAppDpiX(0, 96);
 #endif
 
+#ifndef Q_OS_WIN
     signal(SIGILL, crashHandler);    /* 4:   illegal instruction (not reset when caught) */
     signal(SIGTRAP, crashHandler);   /* 5:   trace trap (not reset when caught) */
     signal(SIGFPE, crashHandler);    /* 8:   floating point exception */
@@ -131,6 +134,7 @@ int main(int argc, char* argv[])
     signal(SIGPIPE, crashHandler);   /* 13:  write on a pipe with no reader */
     signal(SIGXCPU, crashHandler);   /* 24:  exceeded CPU time limit */
     signal(SIGXFSZ, crashHandler);   /* 25:  exceeded file size limit */
+#endif
 
     QStringList args = app.arguments();
     if (args.count() < 2) {

-- 
WebKit Debian packaging