Bug 57018 – [Qt] Remove modular references after support for the flag was removed.

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Qt

[Kristian Amlie]

Support was removed because the Qt Modularization project decided we don't need it. It's better to base decisions on the available information, as demonstrated in the patch by checking QT.phonon.includes.

In addition, remove the reference to uitools. It has been moved to QtKernel now, and therefore is always available.

[Kristian Amlie]

Created attachment 86779 [details]
Removed-modular-references-after-support-for-the-flag-was-removed

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 86779 [details]:

security/block-test-no-port.html bug 52164 (author: [e-mail])
The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 86779 [details]
Removed-modular-references-after-support-for-the-flag-was-removed

Clearing flags on attachment: 86779

Committed r82232: <http://trac.webkit.org/changeset/82232>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Robert Hogan]

This broke:

platform/qt/plugins/qt-qwidget-plugin.html
plugins/application-plugin-plugins-disabled.html

http://trac.webkit.org/changeset/82489 prompted it to start failing the two tests by touching DumpRendertreeQt.cpp: 

The problem seems to be here:

http://trac.webkit.org/changeset/82240/trunk/Source/WebKit.pri

DRT is now getting built with QT_NO_UITOOLS inherited from WebKit.pri - as 
a result createPlugins() doesn't create the QtPlugins in the failing tests.

[Csaba Osztrogonác]

Reopen, becaue I rolled out the patch and the Symbian buildfix
before go to bed at 5:22 am : http://trac.webkit.org/changeset/82539

We can check it after sleeping.

[Andras Becsi]

(In reply to comment #0)
> In addition, remove the reference to uitools. It has been moved to QtKernel now, and therefore is always available.

Does that mean that QtKernel now depends on uitools internally? Because I checked Qt master ToT now and uitools is still in tools/designer/src/uitools.

If UiLoader is always available, some more changes might be needed in:

Tools/DumpRenderTree/qt/DumpRenderTree.pro
Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp
Tools/QtTestBrowser/QtTestBrowser.pro
Tools/QtTestBrowser/launcherwindow.h
Tools/QtTestBrowser/webpage.cpp

However this would probably cause the Symbian and minimal builds to break.

We definetely need more information on this.

[Csaba Osztrogonác]

I chekced it on the buildbot. 

contains(QT_CONFIG, modular) - false
!contains(QT_CONFIG, uitools) - true
disable_uitools - false

Accordingly the original "contains(QT_CONFIG, modular):!contains(QT_CONFIG, uitools)|disable_uitools" is false, but my Symbian buildfix: "!contains(QT_CONFIG, uitools)|disable_uitools" is true.

It is absolutely incorrect, because with Qt 4.7.2, I have working uitools,
but don't have modular in my QT_CONFIG and don't have uitools in my QT_CONFIG.

I'm going to check how can we make Qt 4.7.2 and Qt trunk users happy.

[Kristian Amlie]

Yes, I think maybe that part about uitools must be brought back. I didn't think about the case where a certain platform leaves out uitools. For Linux it's always compiled.

I'll get a new patch up first thing tomorrow morning.

[Kristian Amlie]

Created attachment 87833 [details]
Removed-modular-references-after-support-for-the-flag-was-removed-v2

Updated version, now with the check for uitools kept intact.

[Alexis Menard (darktears)]

Comment on attachment 87833 [details]
Removed-modular-references-after-support-for-the-flag-was-removed-v2

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

> ChangeLog:13
> +        https://bugs.webkit.org/show_bug.cgi?id=57018

This should be on the top : look this example changelog entry http://trac.webkit.org/changeset/43259 .

[Kristian Amlie]

Created attachment 88780 [details]
Removed-modular-references-after-support-for-the-flag-was-removed-v3

[Kristian Amlie]

FYI, I will be away for the next two weeks, so I will not respond during that time.

[Andreas Kling]

Comment on attachment 88780 [details]
Removed-modular-references-after-support-for-the-flag-was-removed-v3

rs=me

[WebKit Commit Bot]

The commit-queue encountered the following flaky tests while processing attachment 88780 [details]:

java/lc3/JSObject/ToObject-001.html bug 53091 (author: [e-mail])
The commit-queue is continuing to process your patch.

[WebKit Commit Bot]

Comment on attachment 88780 [details]
Removed-modular-references-after-support-for-the-flag-was-removed-v3

Clearing flags on attachment: 88780

Committed r83340: <http://trac.webkit.org/changeset/83340>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.