Changeset 96477 in webkit


Ignore:
Timestamp:
Oct 2, 2011 12:54:31 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

[Qt][WK2][Mac] WebKit2 does not build on mac after merge of Qt5 refactor branch.
​https://bugs.webkit.org/show_bug.cgi?id=69223

Source/WebCore:

Add a missing import (NSWindow.h) in WebVideoFullscreenHUDWindowController.
Add a missing include path and a missing objective source file to WebCore.pro.

Patch by Zeno Albisser <​zeno.albisser@nokia.com> on 2011-10-02
Reviewed by Noam Rosenthal.

No new tests, build fix.

  • WebCore.pro:
  • platform/mac/WebVideoFullscreenHUDWindowController.h:

Source/WebKit2:

After the merge of the Qt5 refactor branch, networking stuff has been
extracted into a separate library. The qmlplugin needs to link to that
library to get QNetworkReply defined.

Patch by Zeno Albisser <​zeno.albisser@nokia.com> on 2011-10-02
Reviewed by Noam Rosenthal.

  • UIProcess/API/qt/qmlplugin/qmlplugin.pro:
Location:
trunk/Source
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r96476 r96477  
     12011-10-02  Zeno Albisser  <zeno.albisser@nokia.com>
     2
     3        [Qt][WK2][Mac] WebKit2 does not build on mac after merge of Qt5 refactor branch.
     4        https://bugs.webkit.org/show_bug.cgi?id=69223
     5
     6        Add a missing import (NSWindow.h) in WebVideoFullscreenHUDWindowController.
     7        Add a missing include path and a missing objective source file to WebCore.pro.
     8
     9        Reviewed by Noam Rosenthal.
     10
     11        No new tests, build fix.
     12
     13        * WebCore.pro:
     14        * platform/mac/WebVideoFullscreenHUDWindowController.h:
     15
    1162011-10-02  Julien Chaffraix  <jchaffraix@webkit.org>
    217

  • trunk/Source/WebCore/WebCore.pro

    r96455 r96477  
    30623062    contains(DEFINES, WTF_USE_QTKIT=1) {
    30633063        INCLUDEPATH += \
    3064             $$SOURCE_DIR/../WebKitLibraries/
     3064            $$SOURCE_DIR/../WebKitLibraries/ \
     3065            $$PWD/platform/mac
     3066
    30653067
    30663068        HEADERS += \
    … …  
    30893091            platform/mac/KURLMac.mm \
    30903092            platform/text/mac/StringMac.mm \
     3093            platform/text/mac/StringImplMac.mm \
    30913094            platform/graphics/mac/FloatSizeMac.mm \
    30923095            platform/graphics/mac/IntRectMac.mm \

  • trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h

    r95901 r96477  
    3030#import <AppKit/NSTextField.h>
    3131#import <AppKit/NSTrackingArea.h>
     32#import <AppKit/NSWindow.h>
    3233#import <AppKit/NSWindowController.h>
    3334

  • trunk/Source/WebKit2/ChangeLog

    r96465 r96477  
     12011-10-02  Zeno Albisser  <zeno.albisser@nokia.com>
     2
     3        [Qt][WK2][Mac] WebKit2 does not build on mac after merge of Qt5 refactor branch.
     4        https://bugs.webkit.org/show_bug.cgi?id=69223
     5
     6        After the merge of the Qt5 refactor branch, networking stuff has been
     7        extracted into a separate library. The qmlplugin needs to link to that
     8        library to get QNetworkReply defined.
     9
     10        Reviewed by Noam Rosenthal.
     11
     12        * UIProcess/API/qt/qmlplugin/qmlplugin.pro:
     13
    1142011-10-01  Geoffrey Garen  <ggaren@apple.com>
    215

  • trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/qmlplugin.pro

    r92277 r96477  
    77
    88include(../../../../../WebKit.pri)
    9 QT += declarative
     9QT += declarative \
     10      network
    1011
    1112QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
Note: See TracChangeset for help on using the changeset viewer.