Commit Graph

1086 Commits

Author SHA1 Message Date
Eike Ziller
6e8ee7479e Merge remote-tracking branch 'origin/4.3'
Conflicts:
	src/plugins/debugger/cdb/cdbengine.cpp

Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0
2017-05-09 15:07:30 +02:00
Jarek Kobus
3261e73b0c Apply current filter to search results
QHelpSearchIndexReaderDefault is run in a separate thread
in order to return the results of the search. It reads
the info about the current filter in order to filter out
the results. However, the main thread didn't
store the current filter in the qhc file, just in memory,
and the search thread reads the value of the current filter
from qhc file, so this goes out of sync.

This patch stores the current filter in the qhc file
whenever it is changed.

The current code resets the current filter
by the launch of creator anyway.

Task-number: QTCREATORBUG-17845
Change-Id: I7c8d2c93b319c94e1400a677ecee9e9b41b029c3
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-05-04 09:06:13 +00:00
Alessandro Portale
3624a663d8 Reduce usage of qApp in favor of static function calls
Q*Application classes have unusually many static functions. In many
cases in our code, these functions are unnecessarily called as instance
functions, using the qApp helper.

This patch replaces many occurencies of qApp with the according
Q*Application classname.

Change-Id: I6099a419fa7bf969891269c37ed7a9e817ef5124
Reviewed-by: hjk <hjk@qt.io>
2017-04-24 18:36:28 +00:00
Eike Ziller
bac2e6c17a Merge remote-tracking branch 'origin/4.3'
Conflicts:
	src/plugins/cmakeprojectmanager/servermodereader.cpp

Change-Id: I58e7b33d32c41cb48a24a5638ddb256212dd6107
2017-03-30 13:59:12 +02:00
Jarek Kobus
cd2a70c867 Remove unneeded includes
Change-Id: I83a6dc6ba33f7f8e1f6b1babbf60c69554435a0a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2017-03-28 19:13:42 +00:00
Serhii Moroz
6ecb1c4018 Locator: Add highlighting of the search text
Change-Id: Ia166e9667076e46770a754b626ceb28080139e79
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-21 12:31:46 +00:00
Orgad Shaneh
da7cb91446 Merge remote-tracking branch 'origin/4.2' into 4.3
Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
2017-03-14 16:20:14 +02:00
Samuel Gaist
4033471aa9 QRegExp include cleanup
This patch adds the missing include statements for QRegExp.

Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-03-13 22:05:30 +00:00
Serhii Moroz
0e4b233685 RemoteFilterOptions: Add ability to re-order items in the list widget
Change-Id: Iada4b63f13ba1e6875b414eb6ee710209b0b75df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-03-09 15:38:10 +00:00
Serhii Moroz
69da534f99 TextEditor: add right sidebar
Task-number: QTCREATORBUG-9436
Change-Id: Ic0406758a30d52c22c58433f5f35305b798cb462
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-03-09 08:19:54 +00:00
Tim Jenssen
2631ffabd5 Remove spaces in initializer lists
Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
2017-02-22 16:25:09 +00:00
Jarek Kobus
32b628e16b Remove unneded includes of QStringBuilder
Change-Id: I2f9690d9374b44731926a1a1532994e877809e26
Reviewed-by: hjk <hjk@qt.io>
2017-02-02 15:26:54 +00:00
Tobias Hunger
c6f90e575e Utils: Introduce a TemporaryDirectory and TemporaryFile class
Both wrap the corresponding Qt class, but make sure all temporary files
or directories are created inside a "master temporary directory".

Change-Id: I55461be507c828c965224c02863ea5ed9bbf9498
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 12:17:10 +00:00
Tobias Hunger
bd6742a45e Help: Clean up code
Change-Id: I743e799d1414a6d27b468c938c450487edcef0f4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-29 15:23:24 +00:00
Eike Ziller
242f9fce58 Help: Disable Add Bookmark action when current page is blank
Task-number: QTCREATORBUG-14204
Change-Id: I5d4a7ada10f0d69363e96bb4efd158444a051b71
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-01 13:44:04 +00:00
Eike Ziller
ad7ab4bee1 Help: Fix that sourceChanged was not sent when using backward/forward
Change-Id: Idc6ce63768bd77703149b5593f4ebabe88d1b033
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-11-01 13:43:56 +00:00
Eike Ziller
f45c59eb8a Merge remote-tracking branch 'origin/master' into 4.2
Change-Id: I96904f9c65b6c25bb4e04ca34e2d1acb27b8dd58
2016-10-12 10:15:59 +02:00
Eike Ziller
9c2d96c965 Help/macOS: Remove use of deprecated function
Change-Id: I8bffe04ab8900879417063041f4ee48886e31480
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-12 08:13:12 +00:00
Alessandro Portale
22d40f4dc6 Utils: Unify the different Bookmark icons
The variant in Bookmarks was left aligned, which is obsolete due to the
textmark overview tooltip. Bookmarks and Help now use the same icon which
is in Utils.

Change-Id: I0f7899de2f7a8803aa8493659d2991ac13739144
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-10-11 07:09:12 +00:00
Giuseppe D'Angelo
ef5e762ec5 Remote help: add Stack Overflow
Change-Id: Iaa782ab2e7d6d7b36cccfc8291a220fdfa73d19c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-10 16:28:12 +00:00
Giuseppe D'Angelo
52aca31b48 Remote help: switch cplusplus.com to cppreference.com
The previous link didn't even work.

Change-Id: I876ae6e4ae25ee0d3a842020e0c2cdaa2e2a3446
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-10 16:28:05 +00:00
Eike Ziller
b64bb0a7e3 Help: Fix that help viewer opened even if URL is opened in browser
After we constructed the online URL for Qt/Qt Creator documentation that
is not installed locally, we can just open that via desktop services
instead of bothering built-in help viewers.

Change-Id: Ic8a37bc22d34af881b5daf87534d59db4d331e44
Task-number: QTCREATORBUG-16111
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-10-10 11:09:03 +00:00
Alessandro Portale
40d7399755 Help: Small improvements for System Info dialog
1) Make the font non-proportional, since qtDiag's output is formatted
with spaces
2) Make the dialog a window with maximize buttons
3) Fix the formatting for unloaded plugins

Change-Id: I911871b1ffc9dceebcbb04f544cc6d580b95c54e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-28 09:39:29 +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
Tim Jenssen
d915b22db9 improve static initializers
Change-Id: I304fdd6627f01fc216c84930da607127c52409d9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-09-23 14:27:01 +00:00
Eike Ziller
1da05949e9 Help: Add button for opening help in external window
Task-number: QTCREATORBUG-16842
Change-Id: I2d647ea08c108459b56abacc765555d64e787951
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-23 11:54:00 +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
Alessandro Portale
76e51ac5bb Help: Fix some clang warnings
Change-Id: I6e65e0819333d7d5e7f697718690bc8d80b1b189
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-21 14:47:26 +00:00
Alessandro Portale
e809594fae Core: Make IOptionsPage::categoryIcon a Utils::Icon
This is necessary for themable + HighDPI icons in the options dialog.

Change-Id: I8e3ff87a24591af40bb76b39cd970443d7678fae
Reviewed-by: hjk <hjk@qt.io>
2016-09-20 12:52:49 +00:00
Eike Ziller
9648a7e5b4 Context Help: Use correct "close" icon
Context help should have the icon that closes a "panel to the right".

Change-Id: I954171c4f2d604a23bf9c1e6f341de0f5cc87ace
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-16 14:18:05 +00:00
Eike Ziller
0768ef7382 HelpWidget: Use member initialization
Change-Id: I734fa9bb1bd5a0518a6051b9001f61f722c90691
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-09-16 09:53:45 +00:00
Eike Ziller
b547b5b078 Help: Remove QtWebKit backend
QtWebKit is gone, removing it is better than letting it rot.

Change-Id: Ie0a43f9aed028edb76b2e9f2dac0b4a9be8ce05d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-14 10:07:39 +00:00
Eike Ziller
c635c6b50a Merge remote-tracking branch 'origin/4.1'
Conflicts:
	share/qtcreator/qmldesigner/propertyEditorQmlSources/HelperWidgets/ExtendedFunctionButton.qml
	src/plugins/android/androidrunner.cpp
	src/plugins/debugger/debuggerruncontrol.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.cpp
	src/plugins/qmlprofiler/qmlprofilerstatisticsmodel.h
	tests/system/suite_WELP/tst_WELP03/test.py

Change-Id: Ibac4d71d4f4dbe1e4f05052d2f8a2dcfd82edd4c
2016-09-13 12:15:09 +02:00
Eike Ziller
e4e30b24e0 Help: Fix online documentation path
When trying to open pages that should be in the installed documentation,
but are not, we try to open the page from the online documentation in
the external browser (e.g. for the links from Welcome mode). Looks like
the online documentation moved.

Change-Id: I7a8eaf37783661dc4751a12b65efeac419d3a802
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-12 09:10:03 +00:00
Eike Ziller
f38531effb Add a menu entry for copying system information
Which outputs the information from qtdiag, installed plugins,
and general Qt Creator build information.

Task-number: QTCREATORBUG-16135
Change-Id: I618b9883369bae45006bb109f8757e89b091b882
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-05 13:00:54 +00:00
Eike Ziller
c56aa52b80 Merge remote-tracking branch 'origin/4.1'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qmakeprojectmanager/makestep.cpp
	src/shared/qbs

Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
2016-08-31 14:40:38 +02:00
Eike Ziller
365c1b7889 Fix empty locator results for search index
Make sure that we do not cache incomplete result lists when the search
is canceled (e.g. because the user typed another character).

Task-number: QTCREATORBUG-16753
Change-Id: I5a8f7ab54bed236ccd318841d95a3a4aa4106df0
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-08-30 08:25:17 +00:00
Eike Ziller
841778ed69 Merge remote-tracking branch 'origin/4.1'
Change-Id: I80f96f100046625f24b6ab5d13fdb05660365abc
2016-08-22 16:30:56 +02:00
Eike Ziller
052b0337d2 Help settings: Fix crash when removing multiple documentation sets
If they were not selected in the order they appear in the list.
The order of the items in the selection are basically in arbitrary
order, so we need to sort them by row to make sure that we remove them
from bottom to top.

Task-number: QTCREATORBUG-16747
Change-Id: If9be9bb4cd1da71e03946bdd2096034093e3cf14
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2016-08-18 13:10:56 +00:00
Orgad Shaneh
a6c17fc537 Remove all QT_VERSION_CHECK
We only support Qt 5.6 now.

Change-Id: If94864400545b057623e3af0743c55ea1e84e33b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-08-12 13:29:58 +00:00
Ulf Hermann
15fbfaf2e9 Move icons to Utils
This way we can use them from libraries, not only from plugins.

Change-Id: Ic35cfd5f04d638d87606bf272b2c00ded1267c1b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 10:52:53 +00:00
Orgad Shaneh
1853f01a5b Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
2016-08-05 11:40:07 +02:00
Christian Stenger
612dd96307 Help: Fix fallback font family on UNIX
Use "Sans Serif" as it is done inside Qt sources as well.
Otherwise we run into the soft assert when retrieving the
default  fallback font style name on Linux systems.

(Tested with Ubuntu, OpenSuSE, Arch Linux, Gentoo)

Change-Id: Icf04a8ec4ace5014c5526a5a5e5ef45c48660afd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-05 04:39:44 +00:00
Nazar Gerasymchuk
90629108fc UI files: Fix tab order in lots of UI forms
For unknown reasons tab order in listed UI files was set incorrectly and
behave unexpectedly. Now tab order behave naturally.

Changes made for listed objects and touches only UI.

Change-Id: I057b95eb21943ddb29b108682618382661db7be9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-08-02 14:29:27 +00:00
Christian Stenger
a769d2f810 Help: Fix compile for Qt5.5
Change-Id: I8b8063043d5a6be2dc8f9ce1e2e9e36646959050
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-07-21 08:56:37 +00:00
Eike Ziller
b2d7d62426 Help: Fix that selecting fallback font style was very limited
It could only handle combinations of "Regular", "Bold", "Oblique",
but fonts can have their own sets of fancy style names.
Actually set the selected style name on the font and save that
in the settings.

Task-number: QTCREATORBUG-16620
Change-Id: Ibf8cd6f2ac0d3ff1c0fd100e9db627937c0eb1ec
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-21 06:12:29 +00:00
Eike Ziller
8c94419a0b Help: Remove unnecessary QLatin1Strings
Change-Id: Ia5c83d5e2c392873f400f3db396b9c355cdd4192
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-21 06:12:22 +00:00
Eike Ziller
c512f5d71f Help options: Fix that font styles and sizes did not adapt to family
Different families can support completely different styles and sizes,
and sizes also depend on the selected style, so these need to be adapted
when changing familiy or style.

Task-number: QTCREATORBUG-16620
Change-Id: I53a2bfb5e867bf7ea66825a9470ff6c9e73b2040
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-21 06:12:17 +00:00
Eike Ziller
6e730fd79c Help: Remove reading of fallback settings from 3.4
Change-Id: I1a029f7cdfd067e5b3c180d9aca889a09c5ae2b2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-21 06:12:08 +00:00
Orgad Shaneh
d01adc134d Help: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: Ied9c7fcc031e530c41b342de950e2f0ac730bbb1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-30 12:12:00 +00:00