Changeset 79945 in webkit

Timestamp:

Feb 28, 2011 4:57:09 PM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

2011-02-28 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt][WK2] Add a way to test the WebKit 2 APIs
​https://bugs.webkit.org/show_bug.cgi?id=55408

Add the build file for test to the build system.

• Source/WebKit.pri: Add the include path for WebKit 2 APIs.
• Source/WebKit.pro: Add the dependency to build the new test project.

2011-02-28 Benjamin Poulain <​benjamin.poulain@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt][WK2] Add a way to test the WebKit 2 APIs
​https://bugs.webkit.org/show_bug.cgi?id=55408

Add an initial test for the WebKit 2 APIs of Qt.

• UIProcess/API/qt/tests/html/basic_page.html: Added.
• UIProcess/API/qt/tests/qgraphicswkview/qgraphicswkview.pro: Added.
• UIProcess/API/qt/tests/qgraphicswkview/tst_qgraphicswkview.cpp: Added. (View::View): (View::resizeEvent): (tst_QGraphicsWKView::init): (tst_QGraphicsWKView::cleanup): (tst_QGraphicsWKView::loadEmptyPage):
• UIProcess/API/qt/tests/tests.pri: Added.
• UIProcess/API/qt/tests/tests.pro: Added.
• UIProcess/API/qt/tests/util.h: Added. (waitForSignal):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit.pri (modified) (1 diff)
• Source/WebKit.pro (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/qt/tests (added)
• Source/WebKit2/UIProcess/API/qt/tests/html (added)
• Source/WebKit2/UIProcess/API/qt/tests/html/basic_page.html (added)
• Source/WebKit2/UIProcess/API/qt/tests/qgraphicswkview (added)
• Source/WebKit2/UIProcess/API/qt/tests/qgraphicswkview/qgraphicswkview.pro (added)
• Source/WebKit2/UIProcess/API/qt/tests/qgraphicswkview/tst_qgraphicswkview.cpp (added)
• Source/WebKit2/UIProcess/API/qt/tests/tests.pri (added)
• Source/WebKit2/UIProcess/API/qt/tests/tests.pro (added)
• Source/WebKit2/UIProcess/API/qt/tests/util.h (added)

trunk/ChangeLog

@@ +1 @@
+2011-02-28  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt][WK2] Add a way to test the WebKit 2 APIs
+        https://bugs.webkit.org/show_bug.cgi?id=55408
+
+        Add the build file for test to the build system.
+
+        * Source/WebKit.pri: Add the include path for WebKit 2 APIs.
+        * Source/WebKit.pro: Add the dependency to build the new test project.
+
 2011-02-28  Balazs Kelemen  <kbalazs@webkit.org>
 

trunk/Source/WebKit.pri

@@ -56 +56 @@
     $$OUTPUT_DIR/include
 INCLUDEPATH += $$QT.script.includes
+
+webkit2 {
+    INCLUDEPATH += $$OUTPUT_DIR/include/WebKit2
+    # FIXME: Once the public header are well defined for WebKit2, this must go away.
+    INCLUDEPATH += $$PWD/WebKit2/
+}
 
 CONFIG -= warn_on

trunk/Source/WebKit.pro

@@ -14 +14 @@
 SUBDIRS += WebKit/qt/QtWebKit.pro
 
-webkit2:exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
+webkit2 {
+    exists($$PWD/WebKit2/WebProcess.pro): SUBDIRS += WebKit2/WebProcess.pro
+    exists($$PWD/WebKit2/UIProcess/API/qt/tests): SUBDIRS += WebKit2/UIProcess/API/qt/tests
+}
 
 contains(QT_CONFIG, declarative) {

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-02-28  Benjamin Poulain  <benjamin.poulain@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt][WK2] Add a way to test the WebKit 2 APIs
+        https://bugs.webkit.org/show_bug.cgi?id=55408
+
+        Add an initial test for the WebKit 2 APIs of Qt.
+
+        * UIProcess/API/qt/tests/html/basic_page.html: Added.
+        * UIProcess/API/qt/tests/qgraphicswkview/qgraphicswkview.pro: Added.
+        * UIProcess/API/qt/tests/qgraphicswkview/tst_qgraphicswkview.cpp: Added.
+        (View::View):
+        (View::resizeEvent):
+        (tst_QGraphicsWKView::init):
+        (tst_QGraphicsWKView::cleanup):
+        (tst_QGraphicsWKView::loadEmptyPage):
+        * UIProcess/API/qt/tests/tests.pri: Added.
+        * UIProcess/API/qt/tests/tests.pro: Added.
+        * UIProcess/API/qt/tests/util.h: Added.
+        (waitForSignal):
+
 2011-02-28  Anders Carlsson  <andersca@apple.com>