Commit aa1d9bb2 authored by vestbo@webkit.org's avatar vestbo@webkit.org

[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
parent 9dad548e
2010-01-20 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Make DumpRenderTree build on Windows
* WebKit.pro:
2010-01-20 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed by Simon Hausmann.
......
......@@ -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
}
......
2010-01-20 Tor Arne Vestbø <tor.arne.vestbo@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@google.com>
Reviewed by Eric Seidel.
......
......@@ -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
......
......@@ -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") {
......
......@@ -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
};
......
......@@ -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) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment