Skip to content
Permalink
Browse files
2010-10-19 Luiz Agostini <luiz.agostini@openbossa.org>
        Reviewed by Antti Koivisto.

        [Qt] WebKit2 MacOS build fix
        https://bugs.webkit.org/show_bug.cgi?id=47897

        Qt WebKit2 MacOS build fix.

        * bridge/npapi.h:
2010-10-19  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by Antti Koivisto.

        [Qt] WebKit2 MacOS build fix
        https://bugs.webkit.org/show_bug.cgi?id=47897

        Qt WebKit2 MacOS build fix.

        * UIProcess/WebPageProxy.cpp:
        * WebKit2.pri:
        * WebKit2.pro:
2010-10-19  Luiz Agostini  <luiz.agostini@openbossa.org>

        Reviewed by Antti Koivisto.

        [Qt] WebKit2 MacOS build fix
        https://bugs.webkit.org/show_bug.cgi?id=47897

        Qt WebKit2 MacOS build fix.

        * WebKitTestRunner/PlatformWebView.h:
        * WebKitTestRunner/qt/TestControllerQt.cpp:

Canonical link: https://commits.webkit.org/60622@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@70060 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Luiz Agostini committed Oct 19, 2010
1 parent cfea4f2 commit 3cef220d526dd41dbef4f4ebdeea1dbb59c324be
Showing 9 changed files with 51 additions and 10 deletions.
@@ -1,3 +1,14 @@
2010-10-19 Luiz Agostini <luiz.agostini@openbossa.org>

Reviewed by Antti Koivisto.

[Qt] WebKit2 MacOS build fix
https://bugs.webkit.org/show_bug.cgi?id=47897

Qt WebKit2 MacOS build fix.

* bridge/npapi.h:

2010-10-19 Philippe Normand <pnormand@igalia.com>

Reviewed by Xan Lopez.
@@ -513,6 +513,8 @@ typedef struct _NPPrint
#if defined(XP_MACOSX)
#ifndef NP_NO_CARBON
typedef EventRecord NPEvent;
#else
typedef void* NPEvent;
#endif
#elif defined(XP_SYMBIAN)
typedef QEvent NPEvent;
@@ -1,3 +1,16 @@
2010-10-19 Luiz Agostini <luiz.agostini@openbossa.org>

Reviewed by Antti Koivisto.

[Qt] WebKit2 MacOS build fix
https://bugs.webkit.org/show_bug.cgi?id=47897

Qt WebKit2 MacOS build fix.

* UIProcess/WebPageProxy.cpp:
* WebKit2.pri:
* WebKit2.pro:

2010-10-18 Anders Carlsson <andersca@apple.com>

Reviewed by Sam Weinig.
@@ -455,7 +455,7 @@ void WebPageProxy::terminateProcess()
process()->terminate();
}

#if !PLATFORM(CF)
#if !PLATFORM(CF) || defined(BUILDING_QT__)
PassRefPtr<WebData> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback, void* context) const
{
// FIXME: Return session state data for saving Page state.
@@ -1,5 +1,7 @@
# WebKit2 - Qt4 build info

QT += network

# Use a config-specific target to prevent parallel builds file clashes on Mac
mac: CONFIG(debug, debug|release): WEBKIT2_TARGET = webkit2d
else: WEBKIT2_TARGET = webkit2
@@ -12,7 +12,6 @@ TEMPLATE = lib
CONFIG += staticlib
TARGET = $$WEBKIT2_TARGET
DESTDIR = $$WEBKIT2_DESTDIR
QT += network

!CONFIG(release, debug|release) {
OBJECTS_DIR = obj/debug
@@ -1,3 +1,15 @@
2010-10-19 Luiz Agostini <luiz.agostini@openbossa.org>

Reviewed by Antti Koivisto.

[Qt] WebKit2 MacOS build fix
https://bugs.webkit.org/show_bug.cgi?id=47897

Qt WebKit2 MacOS build fix.

* WebKitTestRunner/PlatformWebView.h:
* WebKitTestRunner/qt/TestControllerQt.cpp:

2010-10-19 Adam Barth <abarth@webkit.org>

Reviewed by Eric Seidel.
@@ -26,7 +26,14 @@
#ifndef PlatformWebView_h
#define PlatformWebView_h

#if defined(__APPLE__) && __APPLE__
#if defined(BUILDING_QT__)
namespace WTR {
class WebView;
}
typedef WTR::WebView* PlatformWKView;
class QMainWindow;
typedef QMainWindow* PlatformWindow;
#elif defined(__APPLE__) && __APPLE__
#if __OBJC__
@class WKView;
@class NSWindow;
@@ -39,13 +46,6 @@ typedef NSWindow* PlatformWindow;
#elif defined(WIN32) || defined(_WIN32)
typedef WKViewRef PlatformWKView;
typedef HWND PlatformWindow;
#elif defined(BUILDING_QT__)
namespace WTR {
class WebView;
}
typedef WTR::WebView* PlatformWKView;
class QMainWindow;
typedef QMainWindow* PlatformWindow;
#endif

namespace WTR {
@@ -26,6 +26,8 @@

#include "TestController.h"

#include "WKStringQt.h"

#include <cstdlib>
#include <QCoreApplication>
#include <QEventLoop>

0 comments on commit 3cef220

Please sign in to comment.