diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/qt/ChangeLog | 13 | ||||
| -rw-r--r-- | Source/WebKit/qt/tests/cmake/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | Source/WebKit/qt/tests/cmake/cmake.pro | 5 | ||||
| -rw-r--r-- | Source/tests.pri | 1 |
4 files changed, 36 insertions, 0 deletions
diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog index e4c145be9..94441de35 100644 --- a/Source/WebKit/qt/ChangeLog +++ b/Source/WebKit/qt/ChangeLog @@ -80,6 +80,19 @@ * WidgetSupport/InitWebKitQt.h: (WebKit): Ditto. +2012-12-11 Stephen Kelly <stephen.kelly@kdab.com> + + WebKit tests for the Qt API should include tests of CMake config files + https://bugs.webkit.org/show_bug.cgi?id=104003 + + Rubber-stamped by Simon Hausmann. + + The Qt WebKit CI system is not going to run this test, but it can + be run locally and to test packages. + + * tests/cmake/CMakeLists.txt: Added. + * tests/cmake/cmake.pro: Added. + 2012-11-30 Pierre Rossi <pierre.rossi@gmail.com> [Qt] Introduce setTextSizeMultiplier in the page adapter as well. diff --git a/Source/WebKit/qt/tests/cmake/CMakeLists.txt b/Source/WebKit/qt/tests/cmake/CMakeLists.txt new file mode 100644 index 000000000..8f266fccb --- /dev/null +++ b/Source/WebKit/qt/tests/cmake/CMakeLists.txt @@ -0,0 +1,17 @@ + +cmake_minimum_required(VERSION 2.8) + +project(qmake_cmake_files) + +enable_testing() + +find_package(Qt5Core REQUIRED) + +include("${_Qt5CTestMacros}") + +set(Qt5_MODULE_TEST_DEPENDS Widgets) + +test_module_includes( + WebKit QWebElement + WebKitWidgets QWebView +) diff --git a/Source/WebKit/qt/tests/cmake/cmake.pro b/Source/WebKit/qt/tests/cmake/cmake.pro new file mode 100644 index 000000000..bf2dbcb77 --- /dev/null +++ b/Source/WebKit/qt/tests/cmake/cmake.pro @@ -0,0 +1,5 @@ + +# Cause make to do nothing. +TEMPLATE = subdirs + +CONFIG += ctest_testcase diff --git a/Source/tests.pri b/Source/tests.pri index 981fb9b86..da7538b0a 100644 --- a/Source/tests.pri +++ b/Source/tests.pri @@ -10,6 +10,7 @@ CONFIG += ordered WEBKIT_TESTS_DIR = $$PWD/WebKit/qt/tests SUBDIRS += \ + $$WEBKIT_TESTS_DIR/cmake \ $$WEBKIT_TESTS_DIR/qobjectbridge \ $$WEBKIT_TESTS_DIR/qwebframe \ $$WEBKIT_TESTS_DIR/qwebpage \ |