[webkit-dev] Fix for Qt build
Maciej Stachowiak
mjs at apple.com
Sat May 12 03:32:38 PDT 2007
I can't check this in right now because the SVN server is temporarily
out of disk, but this appears to mostly fix the Qt build, at least in
QtLauncher. Rob Buis helped me test and is running layout tests now.
Index: WebKitQt/ChangeLog
===================================================================
--- WebKitQt/ChangeLog (revision 21427)
+++ WebKitQt/ChangeLog (working copy)
@@ -1,3 +1,14 @@
+2007-05-12 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by Rob Buis.
+
+ - call Frame::init as needed - this prevents crashes but
pages don't appear.
+
+ * Api/qwebframe.cpp:
+ (QWebFramePrivate::init):
+ * WebKitPart/WebKitPart.cpp:
+ (WebKitPart::initView):
+
2007-05-08 Steve Falkenburg <sfalken at apple.com>
Reviewed by Ada.
Index: WebKitQt/Api/qwebframe.cpp
===================================================================
--- WebKitQt/Api/qwebframe.cpp (revision 21427)
+++ WebKitQt/Api/qwebframe.cpp (working copy)
@@ -79,6 +79,7 @@
frameView->setScrollArea(qframe);
frameView->setAllowsScrolling(frameData->allowsScrolling);
frame->setView(frameView.get());
+ frame->init();
eventHandler = frame->eventHandler();
}
Index: WebKitQt/WebKitPart/WebKitPart.cpp
===================================================================
--- WebKitQt/WebKitPart/WebKitPart.cpp (revision 21427)
+++ WebKitQt/WebKitPart/WebKitPart.cpp (working copy)
@@ -123,6 +123,8 @@
m_frame->setView(frameView);
m_frameView->setParentWidget(parentWidget);
+ m_frame->init();
+
// Initialize KParts widget...
setWidget(m_frame->view()->qwidget());
}
More information about the webkit-dev
mailing list