[Qt] Fix compilation without QtQuick1

[Simon Hausmann]

[Qt] Fix compilation without QtQuick1

[Simon Hausmann]

Created attachment 130566 [details]
Patch

[Tor Arne Vestbø]

Comment on attachment 130566 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=130566&action=review

> Source/WebKit/qt/declarative/public.pri:37
> +haveQt(4)|!isEmpty(QT.quick1.name) {
> +    haveQt(5): QT += quick1
> +    DEFINES += HAVE_QQUICK1
> +    SOURCES += qdeclarativewebview.cpp
> +    HEADERS += qdeclarativewebview_p.h
> +}

The detection part of this should be in features.prf, and this part should do contains(DEFINES, HAVE_QQUICK1=1) {}

> Source/tests.pri:30
> +!isEmpty(QT.quick1.name)|haveQt(4) {
> +    contains(QT_CONFIG, declarative): SUBDIRS += $$WEBKIT_TESTS_DIR/qdeclarativewebview

That way you can reuse the detection from features.prf here

[Simon Hausmann]

Created attachment 130607 [details]
Patch

[Simon Hausmann]

Committed r110050: <http://trac.webkit.org/changeset/110050>

[Csaba Osztrogonác]

Reopen, because it broke API tests on Qt 4.8 bots:

********* Start testing of tst_QDeclarativeWebView *********
Config: Using QTest library 4.8.0, Qt 4.8.0
PASS   : tst_QDeclarativeWebView::initTestCase()
QWARN  : tst_QDeclarativeWebView::basicProperties() "1:1:module "QtWebKit" is not installed" 
FAIL!  : tst_QDeclarativeWebView::basicProperties() '!component.isError()' returned FALSE. ()
   Loc: [/ramdisk/qt-linux-release/build/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp(552)]
QWARN  : tst_QDeclarativeWebView::basicProperties() QDeclarativeComponent: Component is not ready
FAIL!  : tst_QDeclarativeWebView::basicProperties() 'wv' returned FALSE. ()
   Loc: [/ramdisk/qt-linux-release/build/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp(106)]
....

[Csaba Osztrogonác]

And one more problem because of this patch:
ERROR:Exec:Timeout, process 'WebKitBuild/Release/Source/WebKit/qt/tests/benchmarks/webgl/tst_webgl' (2608) was terminated

Before this patch tst_webgl wasn't run at all.

[Csaba Osztrogonác]

WebGL tests pass for me with x forward:

********* Start testing of tst_WebGlPerformance *********
Config: Using QTest library 4.8.0, Qt 4.8.0
PASS   : tst_WebGlPerformance::initTestCase()
QDEBUG : tst_WebGlPerformance::benchSoftwareFallbackRgb16() loaded the Generic plugin
RESULT : tst_WebGlPerformance::benchSoftwareFallbackRgb16():
     58 msecs per iteration (total: 58, iterations: 1)
PASS   : tst_WebGlPerformance::benchSoftwareFallbackRgb16()
RESULT : tst_WebGlPerformance::benchSoftwareFallbackRgb32():
     129 msecs per iteration (total: 259, iterations: 2)
PASS   : tst_WebGlPerformance::benchSoftwareFallbackRgb32()
RESULT : tst_WebGlPerformance::benchSoftwareFallbackArgb32():
     156 msecs per iteration (total: 156, iterations: 1)
PASS   : tst_WebGlPerformance::benchSoftwareFallbackArgb32()
RESULT : tst_WebGlPerformance::benchSoftwareFallbackArgb32Premultiplied():
     155 msecs per iteration (total: 155, iterations: 1)
PASS   : tst_WebGlPerformance::benchSoftwareFallbackArgb32Premultiplied()
PASS   : tst_WebGlPerformance::cleanupTestCase()
Totals: 6 passed, 0 failed, 0 skipped
********* Finished testing of tst_WebGlPerformance *********


But unfortunately they times out with xvfb (on the bots):
********* Start testing of tst_WebGlPerformance *********
Config: Using QTest library 4.8.0, Qt 4.8.0
PASS   : tst_WebGlPerformance::initTestCase()
QDEBUG : tst_WebGlPerformance::benchSoftwareFallbackRgb16() loaded the Generic plugin 
RESULT : tst_WebGlPerformance::benchSoftwareFallbackRgb16():
     0.52 msecs per iteration (total: 67, iterations: 128)
PASS   : tst_WebGlPerformance::benchSoftwareFallbackRgb16()
QFATAL : tst_WebGlPerformance::benchSoftwareFallbackRgb32() Received signal 15
FAIL!  : tst_WebGlPerformance::benchSoftwareFallbackRgb32() Received a fatal error.
   Loc: [Unknown file(0)]
Totals: 2 passed, 1 failed, 0 skipped

[Csaba Osztrogonác]

I tested webgl tests locally, all of them work in xvfb, but they are very slow:
--------------------------------------------------------------------------------
$ time run-in-xvfb.sh WebKitBuild/Release/Source/WebKit/qt/tests/benchmarks/webgl/tst_webgl
real    4m30.404s

$ time WebKitBuild/Release/Source/WebKit/qt/tests/benchmarks/webgl/tst_webgl
real    1m20.001s

Additionally I tested webgl tests with Qt5 in xvfb, they are quite fast:
-------------------------------------------------------------------------
$ time run-in-xvfb.sh WebKitBuild/Release/Source/WebKit/qt/tests/benchmarks/webgl/tst_webgl
real    0m22.439s

[Csaba Osztrogonác]

Comment on attachment 130607 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=130607&action=review

> Source/WebKit/qt/declarative/plugin.cpp:57
> +#if defined(HAVE_QQUICK1)
>          qmlRegisterType<QDeclarativeWebSettings>();
>          qmlRegisterType<QDeclarativeWebView>(uri, 1, 0, "WebView");
>  #ifdef Q_REVISION
>          qmlRegisterRevision<QDeclarativeWebView, 0>("QtWebKit", 1, 0);
>          qmlRegisterRevision<QDeclarativeWebView, 1>("QtWebKit", 1, 1);
>  #endif
> +#endif

I got the problem. :) Tests fail only on Qt 4.8, because HAVE_QQUICK1 isn't 
defined here, because features.pri isn't included by WebKit/qt/declarative/public.pri

Patch is coming soon.

[Csaba Osztrogonác]

Created attachment 131030 [details]
proposed Qt4.8 API tests fix after r110050

[Csaba Osztrogonác]

Created attachment 131031 [details]
proposed Qt4.8 API tests fix after r110050

I shouldn't have submit "git --color" patch. :))

[Csaba Osztrogonác]

Additionally I disabled WebGL performance tests about Simons suggestion - http://trac.webkit.org/changeset/110288

[Zoltan Herczeg]

Comment on attachment 131031 [details]
proposed Qt4.8 API tests fix after r110050

r=me

[Csaba Osztrogonác]

(In reply to comment #13)
> (From update of attachment 131031 [details])
> r=me

Landed in http://trac.webkit.org/changeset/110291