Commit Graph

1086 Commits

Author SHA1 Message Date
Christian Stenger
b9c5d63c27 Help:iOS: Replace QRegExp by QRegularExpression
Task-number: QTCREATORBUG-24098
Change-Id: Ie63ac88e3afdc39db0d9ead4b058efbaec402001
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-13 12:45:11 +00:00
hjk
e1c88116b3 Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
(cherry picked from commit 430a33dcd9)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-07-06 11:15:18 +00:00
hjk
430a33dcd9 Core/Utils: Migrate further to Utils::Id
The coreplugin/id.h header is kept for downstream for now.

Change-Id: I8c44590f7b988b3770ecdc177c40783e12353e66
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-07-06 06:07:13 +00:00
hjk
03838decb9 More QRegularExpression and include for Qt 6
Task-number: QTCREATORBUG-24098
Change-Id: Ia537e26efd3f37319c38d906e569b255768371f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-06-25 07:13:43 +00:00
hjk
18e2300337 QLiteHtml: Remove accidentally introduced dependency on Utils
Amends 1c81a3b3e.

Change-Id: I4a1b0cae5bac5bd5801e1868420e9e23598c0c79
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-17 10:05:40 +00:00
hjk
1c81a3b3e8 All: Use Utils::SkipEmptyParts
Task-number: QTCREATORBUG-24098
Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-06-17 05:55:25 +00:00
Alessandro Portale
0be309bcf1 Various places: performance-for-range-copy
Change-Id: I475990d32a5211d31a77782667a2dfedba134137
Reviewed-by: hjk <hjk@qt.io>
2020-06-15 05:58:46 +00:00
Eike Ziller
5b364de168 Use dialogParent() instead of mainWindow()
There are very few reasons to use mainWindow() directly.
Especially for modal dialogs, using dialogParent() is important, since
that guarantees the stacking order in case of other dialogs currently
being open.

Change-Id: I7ad2c23c5034b43195eb35cfe405932a7ea003e6
Reviewed-by: hjk <hjk@qt.io>
2020-06-02 11:44:53 +00:00
Eike Ziller
e5bb7d1ffe Remove unnecessary removeContextObject calls
They are removed on deletion now.

Change-Id: I08461ea4938e24ab450df013a0f8f820032381da
Reviewed-by: hjk <hjk@qt.io>
2020-05-27 08:42:00 +00:00
Cristian Adam
a81b6b623e CMake Build: Update CMake minimum Version to 3.10
This is due to policy CMP0071 which affects AUTOMOC and
generated files.

With CMP0071 set to OLD (CMake 3.9) precompiled headers
would fail to work with GCC.

GCC and precompiled headers would still require the upcoming
3.18 CMake, but having CMP0071 set to NEW (CMake 3.10) is
a prerequisite.

Change-Id: I7c3c1f739877646a91ffa07e2a8006ab7d6f4d77
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-05-26 11:41:44 +00:00
Christian Kandeler
b02f6b5d30 ProjectExplorer: Give the Task class an explicit summary
We'd like to create more useful tasks from compiler output, that is, try
harder to identify consecutive lines that refer to the same issue and
create one task for them, rather than one for each line. In such
"aggregate" tasks, the first line will not necessarily carry the main
information. Therefore, we make it explicit what this main information
is by introducing a dedicated summary member.
Also streamline the font handling for compile tasks.

Change-Id: I933f2643a13c710dab1ab548c56669b129026eb5
Reviewed-by: hjk <hjk@qt.io>
2020-05-14 08:23:59 +00:00
Eike Ziller
8f9ac46e2a Use new filter engine with Qt 5.15 also when building with CMake
Amends 9ca7326d90

Change-Id: I4eb36abbb61f3356ebdeb199f4245fd7465cc88f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2020-04-29 08:24:28 +00:00
Christian Kandeler
02785342ac Fix some clang warnings about unused lambda captures
There are more, but we need to keep those because MSVC believes they are
required. This is the subset that satisifies both compilers.

Change-Id: I0b0a63d5496acc119a7f0513d3a1da0b76fa1fca
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-24 08:44:58 +00:00
Jarek Kobus
9ca7326d90 Integrate new filter engine
Adapt the code to deprecated usage of map as a multi map,
hence all cases replaced by QMultiMap.

Change-Id: I2d480467cd6e91d3e880555e6a21058dec056b3f
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
2020-04-02 11:22:03 +00:00
Eike Ziller
c8a2ea5433 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp

Change-Id: I2a0ccb84560174c5170d5baaff526c0e095f0ba0
2020-03-19 09:35:50 +01:00
Eike Ziller
9e0009803c Fix lupdate issues
Change-Id: I26f08ae82354c178f6d26f9138796328b50bfba8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-03-18 10:45:15 +00:00
Eike Ziller
ed5e6a4999 Add some additional shortcuts for actions
Add Cmd+Shift+- for decreasing font size on macOS.
Do not add Cmd+= for increasing size, because it conflicts with the
existing shortcut for "Replace and Find Next".

Sprinkle some Backspace shortcuts in addition to Delete for removing
items. There are (laptop) keyboards that either do not have a designated
Delete key (requiring Fn+Backspace) or where the Delete key is not
conveniently located/sized, and there is no benefit in making the
distinction in that case anyhow.

Fixes: QTCREATORBUG-706
Fixes: QTCREATORBUG-13733
Change-Id: I06274a9810b82800ec6158a883c95d2a7ae2465e
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-03-17 09:39:37 +00:00
Eike Ziller
038e8491ee litehtml: Fix selection artifacts with scaled view
If you zoom into a page (Ctrl-+) and then select, artifacts could be
left behind when dragging or removing the selection again.
Fiddle around with coordinate transformations (with regard to rounding)
to fix that.

Change-Id: I68c29d8e3559b90dbb3b93550338e483d14731bf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-13 14:17:16 +00:00
Leena Miettinen
5df9df04be Help: Fix UI text according to the guidelines
https://doc.qt.io/qtcreator-extending/qtcreator-ui-text.html

Task-number: QTCREATORBUG-23683
Change-Id: Ib350a6cb538b12dab24a4dfeb5caf6f779054d83
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-03-11 12:01:52 +00:00
hjk
bb783eb819 Help: Drop use of nullptr for default QFlag
Last one.

Change-Id: Iaef520ad4a0050544fc46ec3cde10c42675448e4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-25 13:15:46 +00:00
Alessandro Portale
2234c517c0 Utils: Add a non-toolbar variant of the "RELOAD" icon
New icon is: Utils::Icons::RELOAD. And the toolbar variant is now
Utils::Icons::RELOAD_TOOLBAR.

Change-Id: I811d83c7340a717968430ac1ce4a5c708c8ddcf9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-07 09:22:07 +00:00
Igor Sidorov
a9e40ad14c Add final specifies to classes
Warning -Wfinal-dtor-non-final-class in clang trunk

Change-Id: I2bf17064bf8898eab10b82b69583a283157766d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-02-05 09:33:55 +00:00
hjk
c3f7ef5340 Several SettingsPages: Code cosmetics
De-Q_OBJECT-ify, remove unnecessary #includes, final-ize, etc.

Change-Id: I461d3e73400dacac90c22e7c84a40e3ea1718b6e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-30 15:04:58 +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
hjk
7e19d1af7c Use even less nullptr for default flags
Change-Id: I5ec30de3e41dfc1c7bf6d5f5e36991eadcbbfb72
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-20 10:09:23 +00:00
hjk
d43b793dd8 Core: Introduce a IOptionsPage::setCategoryIconPath
Less noise on the user side.

Change-Id: I34dea09e8a3c8639f5a7db89b22f8b825b946395
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-16 09:53:45 +00:00
Alessandro Portale
9904464074 Make various Q_LOGGING_CATEGORY's static
Change-Id: I43d3a198b0863d85a7fb305c7cb768f68acbd139
Reviewed-by: hjk <hjk@qt.io>
2020-01-15 14:54:10 +00:00
hjk
c75923756a Core: Provide empty implementation for IOptionPageWidget::finish()
Having it pure virtual only lead to a lot of unnecessary
re-implementation.

Change-Id: I37f71d1a160e21b93c7c73a6304b0eb6d5f0441d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-15 12:28:29 +00:00
Eike Ziller
43f364deb0 Help: Register "Extending Qt Creator" documentation as well
Doesn't hurt, might help.

Change-Id: Ie1173f4a7a4ca4084048ef6c22cd56c8a7916156
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-01-15 06:02:54 +00:00
Tim Jenssen
266c808117 create an online URL in a more general way
it was not working for a QtDesignStudio build

Task-number: QDS-1473
Change-Id: Ic7ca52a99bb54cd312c307f0e0af136421d347c1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-01-13 15:34:34 +00:00
hjk
b5654932f2 Help: Remove some unneeded indirection in DocSettingsPageWidget
Plus mild modernization.

Change-Id: Ib10b48e12bd0f577926ac4b80578cb33bf92a5de
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-08 14:43:41 +00:00
hjk
fe45773df9 Help: Use IOptionsPage convenience for DocSettingsPage
Change-Id: I11c26b9b4f15bdcebc56827e8c3adbfca6534632
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-08 14:39:55 +00:00
Christian Kandeler
ce40ffc7b3 litehtml: Fix qbs build on Windows
Change-Id: Ia67439b0af9365bd2c2ce8d83f215a7fe893c9f1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-01-08 09:50:34 +00:00
Cristian Adam
0424420e3c CMake: Do not install litehtml's include and static library
When doing a cmake --install for Qt Creator we don't want to install
the header files and static library for litehtml.

Change-Id: I076fe2d6bb88d1dfac118c2c9ef105bc8dde442a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-01-07 15:46:39 +00:00
Christian Stenger
806b190723 Help: QLiteHtml: Ensure C++14 is used
Old compilers (e.g. gcc5.3) may not use C++14 as
default.

Change-Id: Ifc7fb9afe23b4aaab0d2f0ee42baca28d3087cfc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-01-06 14:57:32 +00:00
Christian Kandeler
c2501dc938 qbs build: Add litehtml support
Change-Id: Ia78ab35a5e844d5b2a1ee18752445c887228981f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-12-19 13:42:34 +00:00
Eike Ziller
dd7e73221e Move "Web Search" locator filter from Help to Core
It was invented as a "remote help" filter, but it actually doesn't have
anything to do with help or documentation.
Move it to more general place, also to enable future generalization to
another custom filter type.

Change-Id: Ib80eacd3c7cc33ae9f4d9353fa820272e3b0b25f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-12-18 12:42:18 +00:00
Eike Ziller
3dfa188182 Help: Add option to only register highest versioned Qt documentation
In Options > Kits > Qt Versions. And make it the default.
It registers each documentation file only for the highest registered Qt
version. If you have Qt 5.12 and Qt 5.13 registered, but only installed
QtWebEngine for Qt 5.12, you'll get QtWebEngine documentation for Qt
5.12, but the other documentation is from Qt 5.13.
That is usually sufficient, since the documentation still contains "old"
API, and new API is flagged with "since".

This avoids registering a lot of documentation, which creates a startup
performance issue, and also leads to usually unneeded popups for which
Qt version some documentation should be shown.

The option also allows going back to registering all documentation,
and no Qt documentation at all.

Fixes: QTCREATORBUG-21482
Fixes: QTCREATORBUG-22799
Task-number: QTCREATORBUG-10004
Change-Id: I1c7bc73982d48d8e53f5083e2fa851b6c5f60f80
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-12-16 11:03:31 +00:00
Eike Ziller
cc60efdbf6 Help: Add tool button to change target for context help
Adds a button in the tool bar for the help widget.
If the help widget is currently the target for context help, the button
is "checked", and pressing it opens a menu with all the options.
If the help widget is currently not the target for context help, the
button is "unchecked" and pressing it makes the help widget the target
for context help.
The menu can in all cases be opened with a long button press.

Fixes: QTCREATORBUG-17667
Change-Id: I748e18f36ebde03eaa779557dd09f7a2bc0bcb2d
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-11-25 14:49:25 +00:00
Eike Ziller
4e6142c932 Merge remote-tracking branch 'origin/4.11'
Conflicts:
	src/plugins/autotest/testresultspane.cpp
	src/plugins/cmakeprojectmanager/cmaketool.cpp

Change-Id: Iade695ac9cab8bf3e3a1abd6e2c71f4a19132ac0
2019-11-21 22:18:35 +02:00
Cristian Adam
fac8a4179a CMake: Build fix for qlitehtml when submodule was used
Change-Id: If82d46a761b9c59a2d945d723df575e66bd9c5a8
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-11-21 11:22:18 +00:00
Eike Ziller
2c029d8700 Help: Remove hack for fixed Qt issue
The hack was a workaround for QTBUG-51962 which is fixed
since Qt 5.7

Change-Id: Iad76d72359f19febecb98b245a950684e6bba16f
Reviewed-by: hjk <hjk@qt.io>
2019-11-15 08:57:43 +00:00
hjk
0120e462b2 Partial compile fix for current Qt dev and/or Qt 6
This does not cover Utils::MapReduceOption with QVector, and code
that's not compiled on my machine.

Change-Id: Ib63923985c52b1bb74e5ec2068a2bb37469ac618
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-12 10:50:51 +00:00
Eike Ziller
f4d6609d91 Help/litehtml: Correcly escape search expression
Searching for anything with e.g. '(' in it would fail.

Change-Id: Ifdba978855a425f50b2fc80d01841a7d4c33dd11
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-11 07:34:45 +00:00
Eike Ziller
ba8b537851 Update litehtml
Change-Id: I110616a1272cf995880671532008c52a5c068a74
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2019-11-04 10:35:10 +00:00
Nikolai Kosjar
d13f7331b8 Help: Fix a readability-simplify-boolean-expr
Change-Id: I06006091b0e3b1c6b38851907a9e69f1c3c2fc04
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-11-01 09:09:23 +00:00
Eike Ziller
91d785a123 Help: Unregister documentation when unregistering Qt versions
While doing we must take care that we do not remove documentation that
is used by other, still registered Qt versions (since for example
desktop & mobile Qt versions share the same documentation).

Fixes: QTCREATORBUG-16631
Change-Id: I77a38c89698cb3050d4a0a6963ab12d3238e2068
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-10-18 12:08:08 +00:00
Eike Ziller
2c2bca924a Help: Remove functionality of unregistering namespace from public API
Only used by the options page and generally needs knowledge of help
namespaces, which requires querying QtHelp.

Change-Id: Id8eda86e5b373ab3214e8eff6e2e3ce92c1239ba
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-10-16 07:19:18 +00:00
David Schulz
5c3d499cc4 Help/litehtml: fix cmake build on windows
Complains that
'/RTC1' and '/O2' command-line options are incompatible

Change-Id: I9dc075dce2eaaf4df01791ece84a2ebd9bed04f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-08 13:09:49 +00:00
Eike Ziller
123aa77c49 Help/litehtml: Guard against out-of-bounds scroll values
If we set the value of the scrollbar to an invalid value, nothing gets
repainted, so we need to take the branch that calls update explicitly in
that case.

Change-Id: I700c690119b1ee2fe8b88d77c29e00f329810448
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 11:32:41 +00:00