Bug 68687 - [Qt] Fix build against Qt5 after refactor of QWidget into its own library
Summary: [Qt] Fix build against Qt5 after refactor of QWidget into its own library
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Qt (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Tor Arne Vestbø
URL:
Keywords: Qt, QtTriaged
Depends on: 68913
Blocks: 68934
  Show dependency treegraph
 
Reported: 2011-09-23 03:43 PDT by Tor Arne Vestbø
Modified: 2011-10-04 04:34 PDT (History)
5 users (show)

See Also:


Attachments
Patch (43.89 KB, patch)
2011-09-27 14:09 PDT, Alexis Menard (darktears)
no flags Details | Formatted Diff | Diff
Patch (43.87 KB, patch)
2011-09-27 14:38 PDT, Alexis Menard (darktears)
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Tor Arne Vestbø 2011-09-23 03:43:29 PDT
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)
Comment 1 Tor Arne Vestbø 2011-09-23 11:06:57 PDT
https://gist.github.com/1235082
Comment 2 Pierre Rossi 2011-09-23 11:16:03 PDT
(In reply to comment #1)
> https://gist.github.com/1235082

Wrong gist...

https://gist.github.com/1237134
Comment 3 Alexis Menard (darktears) 2011-09-27 14:09:18 PDT
Created attachment 108892 [details]
Patch
Comment 4 Alexis Menard (darktears) 2011-09-27 14:10:20 PDT
(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.
Comment 5 WebKit Review Bot 2011-09-27 14:13:15 PDT
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.
Comment 6 Early Warning System Bot 2011-09-27 14:19:32 PDT
Comment on attachment 108892 [details]
Patch

Attachment 108892 [details] did not pass qt-ews (qt):
Output: http://queues.webkit.org/results/9878430
Comment 7 Alexis Menard (darktears) 2011-09-27 14:30:09 PDT
(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.
Comment 8 Alexis Menard (darktears) 2011-09-27 14:38:16 PDT
Created attachment 108900 [details]
Patch
Comment 9 WebKit Review Bot 2011-09-27 14:40:06 PDT
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.
Comment 10 Alexis Menard (darktears) 2011-09-27 15:17:39 PDT
Obseleted all, Tor-Arne will land all by himself. Was just to help but it seems that all is under control on his side.