Summary: | [Qt] Buildfix for newer Qt5 | ||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Csaba Osztrogonác <ossy> | ||||||||||||||||||||||||||||||||
Component: | Tools / Tests | Assignee: | Csaba Osztrogonác <ossy> | ||||||||||||||||||||||||||||||||
Status: | RESOLVED FIXED | ||||||||||||||||||||||||||||||||||
Severity: | Normal | CC: | cmarcelo, hausmann, menard, ossy, vestbo, webkit.review.bot, zarvai, zoltan | ||||||||||||||||||||||||||||||||
Priority: | P2 | Keywords: | Qt, QtTriaged | ||||||||||||||||||||||||||||||||
Version: | 528+ (Nightly build) | ||||||||||||||||||||||||||||||||||
Hardware: | All | ||||||||||||||||||||||||||||||||||
OS: | All | ||||||||||||||||||||||||||||||||||
Attachments: |
|
Description
Csaba Osztrogonác
2012-07-04 00:16:45 PDT
Created attachment 150723 [details]
first WIP patch
Here is my first WIP patch:
- set QMAKEPATH to /home/oszi/WebKit/Tools/qmake before building manually
- remove all "QT += declarative", because they are build fails now
(but maybe it is still needed for Qt 4, I'll check it later.)
- fix some depracated include suggested by latest Qt5
- use PWD instead of deprecated IN_PWD
Now building QtTestBrowser fails with the following error message:
Project ERROR: Unknown module(s) in QT: webkit
I didn't check Ossi's patches now, maybe there are some overlapping,
it is only my very quick experiment to see what is the status now.
Created attachment 150759 [details]
patch for EWS bots
Attachment 150759 [details] did not pass style-queue:
Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/qt/WebCoreSupport/QtFallback..." exit_code: 1
Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp:26: Alphabetical sorting problem. [build/include_order] [4]
Total errors found: 1 in 6 files
If any of these errors are false positives, please file a bug against check-webkit-style.
Comment on attachment 150759 [details] patch for EWS bots Attachment 150759 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/13127835 Comment on attachment 150759 [details] patch for EWS bots View in context: https://bugs.webkit.org/attachment.cgi?id=150759&action=review >> Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp:26 >> -#include "qwindowsysteminterface_qpa.h" >> +#include "qpa/qwindowsysteminterface.h" > > Alphabetical sorting problem. [build/include_order] [4] Unfortunately this change won't work with the latest pinned Qt5 hash, because the new header isn't exist in it. But we need this change when we update Qt5, because the old header is deprecated and it would cause build fail. Created attachment 150776 [details]
Patch
Comment on attachment 150776 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150776&action=review > Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp:-26 > +#include "qpa/qwindowsysteminterface.h" > #include "qquickwebview_p_p.h" > -#include "qwindowsysteminterface_qpa.h" cq-, because this change doesn't work with the latest pinned Qt5 hash, but it will work with the updated Qt5. I'm going to land with the update. Comment on attachment 150776 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150776&action=review > Source/WebKit/qt/declarative/experimental/experimental.pri:28 > +haveQt(4): QT += declarative This one is not needed, we don't build webkit2 (and the experimental qml plugin) for qt4. > Source/api.pri:135 > + haveQt(4): QT += declarative This one is not needed, we don't build webkit2 for qt4, and we already include quick and qml modules in WebKit2.pri Comment on attachment 150776 [details]
Patch
Good point, I'll update the patch soon.
Created attachment 150781 [details]
Patch
Comment on attachment 150781 [details] Patch Attachment 150781 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/13130822 Created attachment 150929 [details]
Patch
Only these include fixes are remaining for my previous patch. :)
Comment on attachment 150929 [details] Patch Attachment 150929 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/13154009 Comment on attachment 150929 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=150929&action=review > Source/WebKit2/UIProcess/API/qt/qwebkittest.cpp:-26 > -#include "qwindowsysteminterface_qpa.h" We need similar fixes in other places. Here's the full diff: https://gist.github.com/3053577 Created attachment 150933 [details]
Patch
patch for landing
Comment on attachment 150933 [details] Patch Attachment 150933 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/13147080 Created attachment 151054 [details]
[Qt] Switch to new-style Qt 5 configure tests
Created attachment 151055 [details]
[Qt] Adjust to changed generation of master include file
Created attachment 151056 [details]
[Qt] Remove redundant CONFIG+=module
Created attachment 151057 [details]
[Qt] Don't let qt_webkit.pri proclaim its own location
Created attachment 151058 [details]
[Qt] Let qt_module_config create the forwarding module pri file
Created attachment 151059 [details]
[Qt] Unify qtFeatureDefaults code paths
Created attachment 151060 [details]
[Qt] Add top-level .qmake.conf
Created attachment 151061 [details]
[Qt] Remove custom qmake logic for module creation
Created attachment 151062 [details]
[Qt] Make use of Qt5 qmake's changed makefile recursion behavior
Comment on attachment 151054 [details] [Qt] Switch to new-style Qt 5 configure tests Clearing flags on attachment: 151054 Committed r121958: <http://trac.webkit.org/changeset/121958> Comment on attachment 151055 [details] [Qt] Adjust to changed generation of master include file Clearing flags on attachment: 151055 Committed r121959: <http://trac.webkit.org/changeset/121959> Comment on attachment 151056 [details] [Qt] Remove redundant CONFIG+=module Clearing flags on attachment: 151056 Committed r121960: <http://trac.webkit.org/changeset/121960> Comment on attachment 151057 [details] [Qt] Don't let qt_webkit.pri proclaim its own location Clearing flags on attachment: 151057 Committed r121961: <http://trac.webkit.org/changeset/121961> Comment on attachment 151058 [details] [Qt] Let qt_module_config create the forwarding module pri file Clearing flags on attachment: 151058 Committed r121962: <http://trac.webkit.org/changeset/121962> Comment on attachment 151059 [details] [Qt] Unify qtFeatureDefaults code paths Clearing flags on attachment: 151059 Committed r121963: <http://trac.webkit.org/changeset/121963> Comment on attachment 151060 [details] [Qt] Add top-level .qmake.conf Clearing flags on attachment: 151060 Committed r121964: <http://trac.webkit.org/changeset/121964> Comment on attachment 151061 [details] [Qt] Remove custom qmake logic for module creation Clearing flags on attachment: 151061 Committed r121965: <http://trac.webkit.org/changeset/121965> Comment on attachment 151062 [details] [Qt] Make use of Qt5 qmake's changed makefile recursion behavior Clearing flags on attachment: 151062 Committed r121966: <http://trac.webkit.org/changeset/121966> |