RESOLVED FIXED 68687
[Qt] Fix build against Qt5 after refactor of QWidget into its own library
https://bugs.webkit.org/show_bug.cgi?id=68687
Summary [Qt] Fix build against Qt5 after refactor of QWidget into its own library
Tor Arne Vestbø
Reported 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)
Attachments
Patch (43.89 KB, patch)
2011-09-27 14:09 PDT, Alexis Menard (darktears)
no flags
Patch (43.87 KB, patch)
2011-09-27 14:38 PDT, Alexis Menard (darktears)
no flags
Tor Arne Vestbø
Comment 1 2011-09-23 11:06:57 PDT
Pierre Rossi
Comment 2 2011-09-23 11:16:03 PDT
Alexis Menard (darktears)
Comment 3 2011-09-27 14:09:18 PDT
Alexis Menard (darktears)
Comment 4 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.
WebKit Review Bot
Comment 5 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.
Early Warning System Bot
Comment 6 2011-09-27 14:19:32 PDT
Alexis Menard (darktears)
Comment 7 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.
Alexis Menard (darktears)
Comment 8 2011-09-27 14:38:16 PDT
WebKit Review Bot
Comment 9 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.
Alexis Menard (darktears)
Comment 10 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.
Note You need to log in before you can comment on or make changes to this bug.