Bug 57018 - [Qt] Remove modular references after support for the flag was removed.
Summary: [Qt] Remove modular references after support for the flag was removed.
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Qt (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P1 Critical
Assignee: Nobody
URL:
Keywords: Qt, QtTriaged
Depends on:
Blocks:
 
Reported: 2011-03-24 08:33 PDT by Kristian Amlie
Modified: 2011-04-08 13:41 PDT (History)
5 users (show)

See Also:


Attachments
Removed-modular-references-after-support-for-the-flag-was-removed (2.04 KB, patch)
2011-03-24 08:36 PDT, Kristian Amlie
no flags Details | Formatted Diff | Diff
Removed-modular-references-after-support-for-the-flag-was-removed-v2 (1.85 KB, patch)
2011-04-01 01:27 PDT, Kristian Amlie
no flags Details | Formatted Diff | Diff
Removed-modular-references-after-support-for-the-flag-was-removed-v3 (1.85 KB, patch)
2011-04-08 00:33 PDT, Kristian Amlie
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Kristian Amlie 2011-03-24 08:33:42 PDT
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.
Comment 1 Kristian Amlie 2011-03-24 08:36:11 PDT
Created attachment 86779 [details]
Removed-modular-references-after-support-for-the-flag-was-removed
Comment 2 WebKit Commit Bot 2011-03-29 04:58:58 PDT
The commit-queue encountered the following flaky tests while processing attachment 86779 [details]:

security/block-test-no-port.html bug 52164 (author: pam@chromium.org)
The commit-queue is continuing to process your patch.
Comment 3 WebKit Commit Bot 2011-03-29 05:01:57 PDT
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>
Comment 4 WebKit Commit Bot 2011-03-29 05:02:02 PDT
All reviewed patches have been landed.  Closing bug.
Comment 5 Robert Hogan 2011-03-30 15:17:50 PDT
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.
Comment 6 Csaba Osztrogonác 2011-03-30 20:24:09 PDT
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.
Comment 7 Andras Becsi 2011-03-31 02:54:47 PDT
(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.
Comment 8 Csaba Osztrogonác 2011-03-31 03:16:47 PDT
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.
Comment 9 Kristian Amlie 2011-03-31 08:57:11 PDT
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.
Comment 10 Kristian Amlie 2011-04-01 01:27:28 PDT
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.
Comment 11 Alexis Menard (darktears) 2011-04-07 12:56:04 PDT
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 .
Comment 12 Kristian Amlie 2011-04-08 00:33:02 PDT
Created attachment 88780 [details]
Removed-modular-references-after-support-for-the-flag-was-removed-v3
Comment 13 Kristian Amlie 2011-04-08 06:04:24 PDT
FYI, I will be away for the next two weeks, so I will not respond during that time.
Comment 14 Andreas Kling 2011-04-08 11:11:27 PDT
Comment on attachment 88780 [details]
Removed-modular-references-after-support-for-the-flag-was-removed-v3

rs=me
Comment 15 WebKit Commit Bot 2011-04-08 13:37:48 PDT
The commit-queue encountered the following flaky tests while processing attachment 88780 [details]:

java/lc3/JSObject/ToObject-001.html bug 53091 (author: ap@webkit.org)
The commit-queue is continuing to process your patch.
Comment 16 WebKit Commit Bot 2011-04-08 13:41:05 PDT
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>
Comment 17 WebKit Commit Bot 2011-04-08 13:41:09 PDT
All reviewed patches have been landed.  Closing bug.