Commit Graph

18 Commits

Author SHA1 Message Date
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Marco Bubke
21b8186108 Help: Fix missing header for TR
Change-Id: I8f94ca9ff81ec7d4d2c902d7a28b771259ca33ec
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-07-14 15:56:48 +00:00
Eike Ziller
e2d5936a76 Help: Convert to Tr::tr
Change-Id: I3f9ca195488f7cc90e7f58eb15263dde1bc911c4
Reviewed-by: hjk <hjk@qt.io>
2022-07-13 12:30:46 +00:00
Eike Ziller
b7853efaf3 Re-enable QWebEngine help viewer backend for Qt 6.2
Fixes: QTCREATORBUG-26380
Change-Id: I8aa31bebd5a8a20f664a17bca2f657fcfac4b1f5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-11-05 09:10:15 +00:00
Alessandro Portale
93fbd5be02 Remove dead code "< QT_VERSION_CHECK(5, 14, 0)"
Qt Creator required Qt 5.14 or higher. Let's removed the #idef-ed code
for building against lower Qt versions.

Add a comment in porting.h where we still need such code for sdktool.

Change-Id: Ib330275208eec4a2f285b4b9f480530c171f538a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-18 19:12:39 +00:00
Jarek Kobus
700da528b8 Remove unused viewerFont() method
Change-Id: I3da752d7f96162b7cd10e74667a6a3665cb12e14
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-01-19 16:24:16 +00:00
Jarek Kobus
291f46386f Add "Zoom" setting to the Help font settings
If the scrollWheelZooming is enabled, this
setting will get updated when using scroll wheel.
It will also be used when zooming in/out
by using keyboard shortcuts.

Fixes: QTCREATORBUG-25109
Fixes: QTCREATORBUG-25230
Fixes: QTCREATORBUG-23731
Change-Id: I9d22632b4c034ce236fa39dba074df4a2746ff84
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-01-19 16:24:04 +00:00
Alessandro Portale
8c6e6d1dbd Don't initialize QFlags unnecessarily
And if needed, do it with {} instead of with nullptr or 0.

Change-Id: Iae80253cd334494cfe1d69ec1552d710f2a31ad2
Reviewed-by: hjk <hjk@qt.io>
2020-01-21 10:07:22 +00:00
Eike Ziller
3f2c0f0a5a Help: Fix build with Qt < 5.13
Change-Id: I82d43be1fc5a8efa1ff7088aa43c936717efe5df
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-17 12:58:02 +00:00
Eike Ziller
8d3e4c03f0 Help/QtWebEngine: Prevent remote content
Showing remote content adds security implications

Change-Id: I0b5672d9c814b55aca05ea8a28da4f5e0e9f42fd
Reviewed-by: hjk <hjk@qt.io>
2019-09-16 11:34:23 +00:00
Eike Ziller
334c76fd31 Help viewer: Add option for scroll wheel zooming
Fixes: QTCREATORBUG-14154
Change-Id: Ia6c4aedb78954614477f0228ba82c4dc476a2525
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-02-21 13:26:06 +00:00
Jarek Kobus
4669563836 Remove qDebug()
Change-Id: Ie951201ae2cea355e0118cc36c69fdf2cff5c26b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-09-19 12:44:20 +00:00
Alessandro Portale
1dbdd259be Remove some obsolete code inside QT_VERSION_CHECK sections
With Qt 5.9 as minimal build version, we don't need to handle 5.7 or 5.8

Change-Id: Ie1eed95ab46364452b0633f78bebc565a4a63f4a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-27 07:43:49 +00:00
Eike Ziller
e7316c9fe7 Help: Workaround overrideCursor issue with WebEngine based viewer
QWebEngineViewer never sends a loadFinished signal (but a loadStarted
signal) when only the URL fragment changes (QTBUG-65223). Work around by
logging the last URL and recognizing that condition.

Task-number: QTCREATORBUG-19649
Change-Id: I7b96fe60f5c76ebffb36c23e8d62c6cb1aa515aa
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-01 12:08:37 +00:00
Tim Jenssen
6f698f3e98 Help: fix build/typo
Change-Id: I582e251e3af9ff0ff226df070c4a7584f0a57f8f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-09-25 03:13:35 +00:00
Eike Ziller
a416a5b6e3 Help: Option to open links in window
Task-number: QTCREATORBUG-16842
Change-Id: I420f48a00c56ebc89bade7e91ceb8ec391316e36
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-09-23 11:26:07 +00:00
Ulf Hermann
2ce3bf8ed4 Help: Disambiguate the HelpPage classes from QtWebKit and WebEngine
This way the help viewers can coexist and the building against a
version of Qt that has both webkit and webengine available doesn't
fail anymore.

Change-Id: I2de00b03fc7b127899cbf90b91fc2cfb090a47a5
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2016-03-31 12:04:43 +00:00
Eike Ziller
368a718d3d Add QtWebEngine backed help viewer backend
Supports most features. Defined priority for help viewers:
"qtwebkit" > "qtwebengine" > "textbrowser".

Task-number: QTCREATORBUG-13910
Change-Id: I59b4231ef93fdf9df46436850ed3743b5916f9cd
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-03-18 15:32:04 +00:00