Bug 68687 – [Qt] Fix build against Qt5 after refactor of QWidget into its own library

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

[Tor Arne Vestbø]

The Qt5 refactor branch has been merged into Qt5 master, so QWidget and friends now live in the QtWidgets library. We need to update webkit to reflect this change (while still building against 4.8)

[Tor Arne Vestbø]

https://gist.github.com/1235082

[Pierre Rossi]

(In reply to comment #1)
> https://gist.github.com/1235082

Wrong gist...

https://gist.github.com/1237134

[Alexis Menard (darktears)]

Created attachment 108892 [details]
Patch

[Alexis Menard (darktears)]

(In reply to comment #3)
> Created an attachment (id=108892) [details]
> Patch

It's the original patch + all the fixes did later in the trunk.

https://bugs.webkit.org/show_bug.cgi?id=68913 rollout all four patches.

I believe this bug patch is easier to reapply after.

[WebKit Review Bot]

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

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'Source/WebCore/ChangeLog', u..." exit_code: 1

Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp:33:  Alphabetical sorting problem.  [build/include_order] [4]
Tools/MiniBrowser/qt/BrowserWindow.h:41:  This { should be at the end of the previous line  [whitespace/braces] [4]
Tools/MiniBrowser/qt/BrowserWindow.h:45:  The parameter name "window" adds no information, so it should be removed.  [readability/parameter_name] [5]
Tools/MiniBrowser/qt/BrowserWindow.h:45:  The parameter name "widget" adds no information, so it should be removed.  [readability/parameter_name] [5]
Tools/MiniBrowser/qt/BrowserWindow.h:48:  The parameter name "event" adds no information, so it should be removed.  [readability/parameter_name] [5]
Tools/MiniBrowser/qt/BrowserWindow.h:49:  The parameter name "event" adds no information, so it should be removed.  [readability/parameter_name] [5]
Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:47:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
Source/WebKit/qt/Api/qgraphicswebview.cpp:43:  Alphabetical sorting problem.  [build/include_order] [4]
Source/WebKit/qt/Api/qwebview.h:28:  Alphabetical sorting problem.  [build/include_order] [4]
Source/WebKit2/UIProcess/qt/ViewInterface.h:26:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 10 in 52 files


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

[Early Warning System Bot]

Comment on attachment 108892 [details]
Patch

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

[Alexis Menard (darktears)]

(In reply to comment #5)
> Attachment 108892 [details] did not pass style-queue:
> 
> Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'Source/WebCore/ChangeLog', u..." exit_code: 1
> 
> Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp:33:  Alphabetical sorting problem.  [build/include_order] [4]
> Tools/MiniBrowser/qt/BrowserWindow.h:41:  This { should be at the end of the previous line  [whitespace/braces] [4]
> Tools/MiniBrowser/qt/BrowserWindow.h:45:  The parameter name "window" adds no information, so it should be removed.  [readability/parameter_name] [5]
> Tools/MiniBrowser/qt/BrowserWindow.h:45:  The parameter name "widget" adds no information, so it should be removed.  [readability/parameter_name] [5]
> Tools/MiniBrowser/qt/BrowserWindow.h:48:  The parameter name "event" adds no information, so it should be removed.  [readability/parameter_name] [5]
> Tools/MiniBrowser/qt/BrowserWindow.h:49:  The parameter name "event" adds no information, so it should be removed.  [readability/parameter_name] [5]
> Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:47:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
> Source/WebKit/qt/Api/qgraphicswebview.cpp:43:  Alphabetical sorting problem.  [build/include_order] [4]
> Source/WebKit/qt/Api/qwebview.h:28:  Alphabetical sorting problem.  [build/include_order] [4]
> Source/WebKit2/UIProcess/qt/ViewInterface.h:26:  Alphabetical sorting problem.  [build/include_order] [4]
> Total errors found: 10 in 52 files
> 
> 
> If any of these errors are false positives, please file a bug against check-webkit-style.

It was before.

[Alexis Menard (darktears)]

Created attachment 108900 [details]
Patch

[WebKit Review Bot]

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

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'Source/WebCore/ChangeLog', u..." exit_code: 1

Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQtDesktop.cpp:33:  Alphabetical sorting problem.  [build/include_order] [4]
Tools/MiniBrowser/qt/BrowserWindow.h:41:  This { should be at the end of the previous line  [whitespace/braces] [4]
Tools/MiniBrowser/qt/BrowserWindow.h:45:  The parameter name "window" adds no information, so it should be removed.  [readability/parameter_name] [5]
Tools/MiniBrowser/qt/BrowserWindow.h:45:  The parameter name "widget" adds no information, so it should be removed.  [readability/parameter_name] [5]
Tools/MiniBrowser/qt/BrowserWindow.h:48:  The parameter name "event" adds no information, so it should be removed.  [readability/parameter_name] [5]
Tools/MiniBrowser/qt/BrowserWindow.h:49:  The parameter name "event" adds no information, so it should be removed.  [readability/parameter_name] [5]
Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h:47:  Code inside a namespace should not be indented.  [whitespace/indent] [4]
Source/WebKit/qt/Api/qgraphicswebview.cpp:43:  Alphabetical sorting problem.  [build/include_order] [4]
Source/WebKit/qt/Api/qwebview.h:28:  Alphabetical sorting problem.  [build/include_order] [4]
Source/WebKit2/UIProcess/qt/ViewInterface.h:26:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 10 in 52 files


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

[Alexis Menard (darktears)]

Obseleted all, Tor-Arne will land all by himself. Was just to help but it seems that all is under control on his side.