Title: [96477] trunk/Source
- Revision
- 96477
- Author
- [email protected]
- Date
- 2011-10-02 12:54:31 -0700 (Sun, 02 Oct 2011)
Log 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 <[email protected]> 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 <[email protected]> on 2011-10-02
Reviewed by Noam Rosenthal.
* UIProcess/API/qt/qmlplugin/qmlplugin.pro:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96476 => 96477)
--- trunk/Source/WebCore/ChangeLog 2011-10-02 19:41:08 UTC (rev 96476)
+++ trunk/Source/WebCore/ChangeLog 2011-10-02 19:54:31 UTC (rev 96477)
@@ -1,3 +1,18 @@
+2011-10-02 Zeno Albisser <[email protected]>
+
+ [Qt][WK2][Mac] WebKit2 does not build on mac after merge of Qt5 refactor branch.
+ https://bugs.webkit.org/show_bug.cgi?id=69223
+
+ Add a missing import (NSWindow.h) in WebVideoFullscreenHUDWindowController.
+ Add a missing include path and a missing objective source file to WebCore.pro.
+
+ Reviewed by Noam Rosenthal.
+
+ No new tests, build fix.
+
+ * WebCore.pro:
+ * platform/mac/WebVideoFullscreenHUDWindowController.h:
+
2011-10-02 Julien Chaffraix <[email protected]>
Remove an unused member in RenderTable::ColumnStruct
Modified: trunk/Source/WebCore/WebCore.pro (96476 => 96477)
--- trunk/Source/WebCore/WebCore.pro 2011-10-02 19:41:08 UTC (rev 96476)
+++ trunk/Source/WebCore/WebCore.pro 2011-10-02 19:54:31 UTC (rev 96477)
@@ -3061,8 +3061,10 @@
contains(DEFINES, WTF_USE_QTKIT=1) {
INCLUDEPATH += \
- $$SOURCE_DIR/../WebKitLibraries/
+ $$SOURCE_DIR/../WebKitLibraries/ \
+ $$PWD/platform/mac
+
HEADERS += \
platform/graphics/mac/MediaPlayerPrivateQTKit.h \
platform/mac/WebCoreObjCExtras.h \
@@ -3088,6 +3090,7 @@
platform/mac/SharedBufferMac.mm \
platform/mac/KURLMac.mm \
platform/text/mac/StringMac.mm \
+ platform/text/mac/StringImplMac.mm \
platform/graphics/mac/FloatSizeMac.mm \
platform/graphics/mac/IntRectMac.mm \
platform/mac/WebVideoFullscreenController.mm \
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h (96476 => 96477)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h 2011-10-02 19:41:08 UTC (rev 96476)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h 2011-10-02 19:54:31 UTC (rev 96477)
@@ -29,6 +29,7 @@
#import <AppKit/NSControl.h>
#import <AppKit/NSTextField.h>
#import <AppKit/NSTrackingArea.h>
+#import <AppKit/NSWindow.h>
#import <AppKit/NSWindowController.h>
namespace WebCore {
Modified: trunk/Source/WebKit2/ChangeLog (96476 => 96477)
--- trunk/Source/WebKit2/ChangeLog 2011-10-02 19:41:08 UTC (rev 96476)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-02 19:54:31 UTC (rev 96477)
@@ -1,3 +1,16 @@
+2011-10-02 Zeno Albisser <[email protected]>
+
+ [Qt][WK2][Mac] WebKit2 does not build on mac after merge of Qt5 refactor branch.
+ https://bugs.webkit.org/show_bug.cgi?id=69223
+
+ 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.
+
+ Reviewed by Noam Rosenthal.
+
+ * UIProcess/API/qt/qmlplugin/qmlplugin.pro:
+
2011-10-01 Geoffrey Garen <[email protected]>
Removed redundant helper functions for allocating Strong handles
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/qmlplugin.pro (96476 => 96477)
--- trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/qmlplugin.pro 2011-10-02 19:41:08 UTC (rev 96476)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qmlplugin/qmlplugin.pro 2011-10-02 19:54:31 UTC (rev 96477)
@@ -6,7 +6,8 @@
SOURCES += plugin.cpp
include(../../../../../WebKit.pri)
-QT += declarative
+QT += declarative \
+ network
QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
