diff options
| author | Konstantin Tokarev <annulen@yandex.ru> | 2019-10-03 22:48:16 +0300 |
|---|---|---|
| committer | Konstantin Tokarev <annulen@yandex.ru> | 2019-10-04 02:11:52 +0300 |
| commit | 3395426ab651a631aca8ee6b0a694a71df19100f (patch) | |
| tree | 4d1d20f3630ef5e68ee17fa8b3f3de9f3269ec19 /Source/WebKit2 | |
| parent | b47f584d07aec2d78ea4a5a5ccf2c761f44f5585 (diff) | |
| download | qtwebkit-3395426ab651a631aca8ee6b0a694a71df19100f.tar.gz | |
Import QtWebKit commit 49b749171e786df3adcd7a755df428c1846acd69
Change-Id: I4c82d8030969d941bb78b1cc4e77c0a66db8da2c
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Source/WebKit2')
8 files changed, 74 insertions, 0 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro b/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro new file mode 100644 index 000000000..4a8d86f80 --- /dev/null +++ b/Source/WebKit2/UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro @@ -0,0 +1,4 @@ +include(../tests.pri) +SOURCES += $${TARGET}.cpp +QT += webkit-private +DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\" diff --git a/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro b/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro new file mode 100644 index 000000000..02dc197c7 --- /dev/null +++ b/Source/WebKit2/UIProcess/API/qt/tests/publicapi/publicapi.pro @@ -0,0 +1,3 @@ +include(../tests.pri) +SOURCES += $${TARGET}.cpp +QT += webkit-private diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro new file mode 100644 index 000000000..e8ac901f1 --- /dev/null +++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro @@ -0,0 +1,18 @@ +include(../tests.pri) +SOURCES += tst_qmltests.cpp +TARGET = tst_qmltests_DesktopBehavior +OBJECTS_DIR = .obj_DesktopBehavior + +QT += webkit-private +CONFIG += testcase + +QT += qmltest + +DEFINES += DISABLE_FLICKABLE_VIEWPORT=1 +# Test the QML files under DesktopBehavior in the source repository. +DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}DesktopBehavior\\\"\" +DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\" + +OTHER_FILES += \ + DesktopBehavior/* \ + common/* diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro new file mode 100644 index 000000000..6c67da96e --- /dev/null +++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView.pro @@ -0,0 +1,19 @@ +include(../tests.pri) +SOURCES += tst_qmltests.cpp +TARGET = tst_qmltests_WebView +OBJECTS_DIR = .obj_WebView + +QT += webkit-private +CONFIG += testcase + +QT += qmltest + +# Test the QML files under WebView in the source repository. +DEFINES += QUICK_TEST_SOURCE_DIR=\"\\\"$$PWD$${QMAKE_DIR_SEP}WebView\\\"\" +DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\" + +OTHER_FILES += \ + WebView/* \ + common/* + +RESOURCES = resources.qrc diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro new file mode 100644 index 000000000..8ddc4484e --- /dev/null +++ b/Source/WebKit2/UIProcess/API/qt/tests/qmltests/qmltests.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs + +SUBDIRS += DesktopBehavior.pro WebView.pro diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro b/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro new file mode 100644 index 000000000..4a8d86f80 --- /dev/null +++ b/Source/WebKit2/UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro @@ -0,0 +1,4 @@ +include(../tests.pri) +SOURCES += $${TARGET}.cpp +QT += webkit-private +DEFINES += IMPORT_DIR=\"\\\"$${ROOT_BUILD_DIR}$${QMAKE_DIR_SEP}imports\\\"\" diff --git a/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro b/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro new file mode 100644 index 000000000..02dc197c7 --- /dev/null +++ b/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro @@ -0,0 +1,3 @@ +include(../tests.pri) +SOURCES += $${TARGET}.cpp +QT += webkit-private diff --git a/Source/WebKit2/UIProcess/API/qt/tests/tests.pri b/Source/WebKit2/UIProcess/API/qt/tests/tests.pri new file mode 100644 index 000000000..a1133530d --- /dev/null +++ b/Source/WebKit2/UIProcess/API/qt/tests/tests.pri @@ -0,0 +1,20 @@ +TEMPLATE = app + +VPATH += $$_PRO_FILE_PWD_ +TARGET = tst_$$TARGET + +INCLUDEPATH += $$PWD +SOURCES += ../util.cpp + +QT += testlib webkit +have?(QTQUICK) { + QT += qml quick quick-private + HEADERS += ../bytearraytestdata.h \ + ../util.h + + SOURCES += ../bytearraytestdata.cpp +} +WEBKIT += wtf # For platform macros + +DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD\\\" \ + QWP_PATH=\\\"$${ROOT_BUILD_DIR}/bin\\\" |