feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Re-enable native WebKit help viewer

Browse Source 
Was disabled since QMacCocoaViewContainer is gone in Qt 6. Works with
the suggested QWindow::fromWinId + QWidget::createWindowContainer
though.

WebKit(1) is deprecated though, and litehtml works pretty well nowadays,
so this is more academical than really useful. (litehtml stays the
default, opt-in to WebKit is possible in Preferences > Help > Viewer
backend)

Change-Id: I6c54a6ff4de790f098cd852eb753545d9a5540a4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Eike Ziller
2022-07-13 16:05:03 +02:00
parent b4b1051e08
commit d7aeb21bfb
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/help/macwebkithelpviewer.h
View File

@@ -27,8 +27,6 @@
#include "helpviewer.h"
#include <QMacCocoaViewContainer>
Q_FORWARD_DECLARE_OBJC_CLASS(DOMNode);
Q_FORWARD_DECLARE_OBJC_CLASS(DOMRange);
Q_FORWARD_DECLARE_OBJC_CLASS(NSString);
@@ -40,7 +38,7 @@ namespace Internal {
class MacWebKitHelpViewer;
class MacWebKitHelpWidgetPrivate;
class MacWebKitHelpWidget : public QMacCocoaViewContainer
class MacWebKitHelpWidget : public QWidget
{
Q_OBJECT