Changeset 69107 in webkit


Ignore:
Timestamp:
Oct 5, 2010 7:30:50 AM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-10-05 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r69103.
​http://trac.webkit.org/changeset/69103
​https://bugs.webkit.org/show_bug.cgi?id=47177

Breaking Windows and Mac build. (Requested by lca on #webkit).

  • UIProcess/API/C/WKNativeEvent.h:
  • UIProcess/API/qt/qwkpage.cpp:
  • UIProcess/API/qt/qwkpage.h:
  • WebKit2.pri:
Location:
trunk/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r69103 r69107  
     12010-10-05  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r69103.
     4        http://trac.webkit.org/changeset/69103
     5        https://bugs.webkit.org/show_bug.cgi?id=47177
     6
     7        Breaking Windows and Mac build. (Requested by lca on #webkit).
     8
     9        * UIProcess/API/C/WKNativeEvent.h:
     10        * UIProcess/API/qt/qwkpage.cpp:
     11        * UIProcess/API/qt/qwkpage.h:
     12        * WebKit2.pri:
     13
    1142010-10-05  Luiz Agostini  <luiz.agostini@openbossa.org>
    215

  • trunk/WebKit2/UIProcess/API/C/WKNativeEvent.h

    r69103 r69107  
    3131#endif
    3232
    33 #if PLATFORM(QT)
    34 class QEvent;
    35 typedef const QEvent* WKNativeEventPtr;
    36 #else
    3733#ifdef __APPLE__
    3834#ifdef __OBJC__
    … …  
    4743typedef const void* WKNativeEventPtr;
    4844#endif
    49 #endif
    5045
    5146#ifdef __cplusplus

  • trunk/WebKit2/UIProcess/API/qt/qwkpage.cpp

    r69103 r69107  
    3939#include <QTouchEvent>
    4040#include <QtDebug>
    41 #include <WebKit2/WKBase.h>
    4241#include <WebKit2/WKFrame.h>
    43 #include <WebKit2/WKPage.h>
    4442#include <WebKit2/WKRetainPtr.h>
     43
    4544
    4645using namespace WebKit;

  • trunk/WebKit2/UIProcess/API/qt/qwkpage.h

    r69103 r69107  
    99#include <QSize>
    1010#include <QUrl>
     11#include <WebKit2/WKBase.h>
     12#include <WebKit2/WKPage.h>
    1113#include <WebKit2/WKPageNamespace.h>
    1214

  • trunk/WebKit2/WebKit2.pri

    r69103 r69107  
    1515
    1616    # Make symbols visible
    17     mac:QMAKE_LFLAGS += -Wl,-all_load -l$$WEBKIT2_TARGET
    18     else:QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
     17    QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
    1918
    2019    POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}lib$${WEBKIT2_TARGET}.a
Note: See TracChangeset for help on using the changeset viewer.