Bug 87257 – [Qt] Buildfix for newer Qt5

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Csaba Osztrogonác]

I'm on it.

[Csaba Osztrogonác]

Created attachment 143559 [details]
proposed buildfix

[Csaba Osztrogonác]

(In reply to comment #1)
> Created an attachment (id=143559) [details]
> proposed buildfix

I tested on the latest Qt5 - 9985003ac4a42adfa35db286eda1b2ae9656d85b,
and the buildfix based on the following changes in Qt5:

QIcon: move back to QtGui
qtbase - 6c06e14a49773ce5572935864ed6b9be219c6103
Change-Id: I1b63759f892ebc02dfc30f41bb6e76e0b7451182

Make QCoreApp::translate and related methods use UTF-8
qtbase - 83645377e98fb1312b6f80a1c996a013b62f0b46
Change-Id: Ic62d6947046dee9be0cbd37f2d2f6976b9e572a7

Remove QtDeclarative compatibility module
qtdeclarative - 35dd4cbd3d09fbcc11804995b65dd8dea03da5ee
Change-Id: I05a9727013d9e38c2262577f68260a4382bfbeea

[Csaba Osztrogonác]

Comment on attachment 143559 [details]
proposed buildfix

cq- of course, because I'm going to land the fix sync with the Qt5 update.

[WebKit Review Bot]

Attachment 143559 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/Api/qgraphicswebview.h', ..." exit_code: 1
Source/WebKit/qt/Api/qgraphicswebview.h:31:  Alphabetical sorting problem.  [build/include_order] [4]
Source/WebKit/qt/declarative/plugin.cpp:48:  Failed to find complete declaration of class WebKitQmlPlugin  [build/class] [5]
Total errors found: 2 in 8 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Csaba Osztrogonác]

Comment on attachment 143559 [details]
proposed buildfix

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

>> Source/WebKit/qt/Api/qgraphicswebview.h:31
>> +#include <QtGui/qicon.h>
> 
> Alphabetical sorting problem.  [build/include_order] [4]

Will fix before landing.

>> Source/WebKit/qt/declarative/plugin.cpp:48
>> +class WebKitQmlPlugin : public QQmlExtensionPlugin {
> 
> Failed to find complete declaration of class WebKitQmlPlugin  [build/class] [5]

It is an ugly fix which can't be understandable by style 
checker, but I had no better idea to make Qt4 and Qt5 happy.

[Simon Hausmann]

Comment on attachment 143559 [details]
proposed buildfix

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

> Source/WebKit/qt/declarative/plugin.cpp:47
> +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))

I'm surprised this works with the moc......

> Source/WebKit/qt/declarative/plugin.cpp:51
> +class WebKitQmlPlugin : public QQmlExtensionPlugin {
> +#else
>  class WebKitQmlPlugin : public QDeclarativeExtensionPlugin {
> +#endif

If this works, then it's okay for now. I'll try to split up the plugin into a proper QtQuick1 based plugin that exports QDeclarativeWebView and one that exports the QML2 components.

[Early Warning System Bot]

Comment on attachment 143559 [details]
proposed buildfix

Attachment 143559 [details] did not pass qt-wk2-ews (qt):
Output: http://queues.webkit.org/results/12772226

[Early Warning System Bot]

Comment on attachment 143559 [details]
proposed buildfix

Attachment 143559 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/12767285

[Csaba Osztrogonác]

Comment on attachment 143559 [details]
proposed buildfix

I'm fixing the 4.8 build.

[Csaba Osztrogonác]

Created attachment 143775 [details]
Patch

style error fixed, try to make MOC happier

[WebKit Review Bot]

Attachment 143775 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/Api/qgraphicswebview.h', ..." exit_code: 1
Source/WebKit/qt/declarative/plugin.cpp:48:  Failed to find complete declaration of class WebKitQmlPlugin  [build/class] [5]
Total errors found: 1 in 8 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Simon Hausmann]

Comment on attachment 143775 [details]
Patch

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

> Source/WebKit/qt/declarative/plugin.cpp:47
> +#if QT_VERSION >= 0x050000

Yeah, I think moc can handle this one much better :)

[Early Warning System Bot]

Comment on attachment 143775 [details]
Patch

Attachment 143775 [details] did not pass qt-wk2-ews (qt):
Output: http://queues.webkit.org/results/12805097

[Csaba Osztrogonác]

Comment on attachment 143775 [details]
Patch

Clearing flags on attachment: 143775

Committed r118511: <http://trac.webkit.org/changeset/118511>

[Csaba Osztrogonác]

All reviewed patches have been landed.  Closing bug.