Commit Graph

61529 Commits

Author SHA1 Message Date
Christian Stenger
a03074e139 AutoTest: Remove leftover code and message
This kind of filtering has been removed long ago
and therefore it should be impossible to get triggered.

Change-Id: Ic9ea02b5446edaadda4d7f21846b37a2f8178505
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-09-17 13:09:14 +00:00
Christian Stenger
42edcc5771 AutoTest: Allow re-parsing with a sub-set of parsers
Avoid expanding parsing over all parsers if we trigger a
re-parse for a different parser and there is already a
re-parse postponed.

Change-Id: If74480fea2c671b32083fb7cf3f4dc4c418e6e33
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-09-17 13:05:44 +00:00
Christian Stenger
c5f7de0a99 Python: Remove unused function
Change-Id: If464646dfad66a1afabb9b5b9c6366a35597f370
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-09-17 13:05:33 +00:00
Eike Ziller
dff7e1515a Help/litehtml: Implement text search
Build an index between (visible) text and litehtml elements, so we can
use the regular text search functionality of Qt.

Change-Id: I2bf29628482f81c67b20b9a02d7808a330a073eb
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-09-17 12:58:25 +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
Tobias Hunger
c3f31b6332 CMake: Handle translations
(Optionally) re-generate .ts files from CMake by running lupdate and
run lrelease to generate .qm files.

Changes to qmake:

* src/libs/3rdparty/syntax-highlighting/src/cli/kate-syntax-highlighter.cpp
  is no longer translated: It's a command line tool that is not used by creator
* src/libs/aggregation/examples/text/main.cpp is no longer included in ts files
* src/libs/qt-breakpad/qtcrashhandler/* is no longer included in ts files:
  It is not built right now

Change-Id: Iec018da86a111a68ec983a880cef2961b48ccdf9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-09-17 12:37:14 +00:00
Tobias Hunger
dac42e9e28 Wizards: Fix JSON of qtquick2-extension wizard
"\." is an invalid backslash escape sequence in JSON. QJSON accepts
this though and silently "fixes" the string by removing the stray
'\' character. This is QTBUG-78443 now, as a conforming JSON parser
should reject invalid data.

The string as "fixed" by QJSON is also not what we wanted in the
first place.

Change-Id: I070999957c6a0c3d0f1753d907ac460e9e341fc1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-09-17 09:30:55 +00:00
Tobias Hunger
2751f30c72 Wizards: Use valid Json only
The original version is not valid JSON, even though the QJSON parser
will accept it:-/

Change-Id: Id408e4b83a62bca358191cf6fe4b3a7ce7d7c59e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-09-17 09:30:46 +00:00
David Schulz
f0ad5813b9 LanguageClient: more FileName to FilePath renaming
Change-Id: I803211d462b442b6881a02e870d2cd816675e0d9
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-17 08:15:40 +00:00
hjk
7f29fa2030 Debugger: Use Python 3 prints also in pure LLDB bridge code
Task-number: QTCREATORBUG-22955
Change-Id: I762acd289c50fe5817b3e6e915f35c2388c74d44
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-17 07:26:17 +00:00
David Schulz
a90c9c6409 Python: extract PythonRunConfiguration and PythonProject
Change-Id: I4ff0f43fdb8beb9a7f2f7816197de0c796da8d89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-17 06:56:51 +00:00
Christian Stenger
358574f44d Android: Fix compile for gcc 5.3
Change-Id: Ic70d6507babeb4b782ace7fb62c37485335311e1
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-09-17 05:28:31 +00:00
Tobias Hunger
cbfd7c4bf8 QtSupport: Allow for Qt6
Detect Core library for Qt 6 as well as Qt 5.

Change-Id: If4b7c0ad3adad796e56706880d03f4824b8ebcd3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-09-16 13:41:25 +00:00
hjk
4a55d995e1 Cmake: Replace connect/disconnect of builddirmanager
... by a permanent connection, and only evaluate output for the
active build configuration.

Task-number: QTCREATORBUG-21235
Change-Id: I06f87f7ea680f8f25687a0c5ffc936c801ab7de0
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-09-16 13:06:10 +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
BogDan Vatra
6b31f9cf23 Android multi arch support
[ChangeLog][Android] Android multi arch support for qmake

Change-Id: Ib8b1874604a3392130c96fbc00b26713b3d788ae
Reviewed-by: hjk <hjk@qt.io>
2019-09-16 07:34:54 +00:00
David Schulz
567a20843f LanguageClient: remember opened documents by TextEditor::TextDocument
... instead of Utils::FilePath

Change-Id: I4ca38ca127fbb1a503a0cb9b5228cab325519550
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-16 07:31:49 +00:00
Thomas Hartmann
73106f330a QmlDesigner: Fix pasteKeyframesToTarget()
Because we attached the model inside the transaction,
then transaction begin message was not handled properly.

Change-Id: I77a56d7874061c0af907047e38a37fec4dab12c1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-09-13 11:39:44 +00:00
Eike Ziller
a1d21fb8fe Help/litehtml: Fix resolution of font name
- check case-insensitively
- need to break after the first font was found in database

Change-Id: Iddd58ec88d61b2506965a618441205e8176e383f
Reviewed-by: hjk <hjk@qt.io>
2019-09-13 11:28:39 +00:00
hjk
db4cc731bb Debugger: Allow timestamp reporting on a sub-item level
Task-number: QTCREATORBUG-22896
Change-Id: I41252868e14f1e4d5dddc0d1c17c097cba6f5fe5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-13 09:07:18 +00:00
Eike Ziller
ef1d5c1264 Help: Fix compilation with < Qt 5.12
Qt Designer broke it by adding unneeded colorroles that don't exist
in earlier versions
Follow-up of 1bbdb1440f

Change-Id: Idf2f7708c034989f7501dd321c7f6b208cc33c41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-13 08:11:35 +00:00
Eike Ziller
f5d6eb564b Help: Fix font point sizes with litehtml
Change-Id: Ia2d7434ed965b00075747c0bdd43d90a236b99dd
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-09-13 06:48:02 +00:00
Eike Ziller
b6c2277146 GenericProject: Make dependency on CppTools optional
Especially in the light of the language server, the generic project is
currently the project one can use for language servers that require a
"project workspace".

Makes it possibly to run Qt Creator with
"-noload CppTools" if you still want to use generic
projects with some other language.

Change-Id: Ib9059289a2db4c44c0c1060a02fcdafacb885fbd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-13 06:43:02 +00:00
David Schulz
3beab5c985 ClangTools: Add missing ui file to pro file
Change-Id: I0c63048795f641f06b3212716fb93f9fc2c7bcc9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-13 06:19:34 +00:00
hjk
c485b24011 Debugger: Save a few cycles in the QPointer dumper
Task-number: QTCREATORBUG-22896
Change-Id: If91e2b8a0869052ae07eb4c9f0df015874a5f992
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-12 15:27:42 +00:00
Nikolai Kosjar
1e0523423a ClangTools: Fix saving files before analyzing
...in current file mode.

Change-Id: Iae2ca9dc0ba5325f485943deb7fd93b3e9b419fe
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 13:37:19 +00:00
Nikolai Kosjar
1fad60153e ClangTools: Remove BasicSettingsWidget
This removes the

  [ ] Build the project before Analysis

from the run dialog as it seems unlikely that this option is useful per
project.

Change-Id: I65f2ae8d1e936883f27c360d5b7b518fd31cdf07
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 13:36:57 +00:00
Nikolai Kosjar
58a724b489 ClangTools: Merge ClangTidyClazyRunControl into ClangToolsRunControl
Change-Id: I162bbb9374fda0bbfc7f3db8fa245f3b5d6e73ad
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 13:36:33 +00:00
Nikolai Kosjar
342679292c ClangTools: Clean up ClangToolRunner
Change-Id: Icf0b8910ed236e48cfa775983e181491e6e9b6b0
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 13:36:01 +00:00
Nikolai Kosjar
04f9c41432 ClangTools: Add action for running on current file
Ideally, we would build the particular file before running the analyzer,
but not every project manager supports that.

For now, skip building the project for this action.

Change-Id: Ibc516c41dd0dbeb7b17b44c0ac35ae4b46ae801d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 13:35:43 +00:00
Nikolai Kosjar
fc37ea4276 ClangTools: Add UI for specifying executables
Add a new group box "Executables" for this. Hide the UI for
clazy-standalone unless QTC_USE_CLAZY_STANDALONE_PATH is set as there is
no released version with the needed -export-fixes option.

Rename the previous group box from "General" to "Run Options".

Change-Id: Ia9daf66c40d3a7eea98b31d9c086886d29466490
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 13:35:01 +00:00
Nikolai Kosjar
8890a7412c ClangTools: Rename ClangToolsBasicSettings -> BasicSettingsWidget
...as it's a widget.

Change-Id: If4f151e7b8ba8c8a6c2b5deb7cba34128a902e3e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 13:34:43 +00:00
Nikolai Kosjar
c9b81d2d39 ClangTools: Rename ClangToolsConfigWidget -> SettingsWidget
Change-Id: I37ee3435054b27fd9e990f2923e6246ecb9e631f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 13:33:21 +00:00
Lisandro Damián Nicanor Pérez Meyer
1ff337089a ClangFormat: improve the message the users see
In this way it's made clear that the plugin requires a patched version of Clang.

Task-number: QTCREATORBUG-22923
Change-Id: Ifefd5ab1a3dc82b85e553c5e1fedffb72919dd17
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 11:44:22 +00:00
Eike Ziller
1bbdb1440f Help: Add option for help viewer backend
Add "Reload" menu item, which re-creates the help viewer with the
current backend.

Change-Id: I979cb9cdf5ae5635f4d028dc41d71ab71ce80248
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-09-12 11:14:11 +00:00
David Schulz
d3c94edd93 LanguageClient: only send contents of TextDocuments to the server
Change-Id: Ifdcd6ba161336814744c51f15e35a756960cb199
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-12 10:53:57 +00:00
Nikolai Kosjar
74688679b2 ClangTools: Allow invoking clazy-standalone instead of clang
...this is for testing and debugging purposes so far.

Eventually, we want to switch to clazy-standalone. But as of now there
is no released clazy version supporting the required "-export-fixes="
option. It's in clazy's master branch only.

Change-Id: If09941dc387658bbc17646a9140f4ee8fad4d6b3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-09-12 10:51:48 +00:00
Nikolai Kosjar
a8f00d147c ClangTools: Invoke clang-tidy instead of clang
Change-Id: Ibcc53cf8cb8bbaf262757bec52f15936506dad50
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 10:24:30 +00:00
Nikolai Kosjar
9f868c44ce ClangTools: Use separate runners for tidy and clazy
For a file to analyze, start one process for tidy and one for clazy.

No functional change.

Change-Id: I049faed5ddbe306e4690ec6831fad19de0de35f6
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 10:23:50 +00:00
Christian Stenger
90189ec3d1 AutoTest: Wizard: Soften condition for gtest repository
Make the need for the googletest repository optional. The user
may have gtest installed inside the system instead.

Change-Id: I4959878fa893d6b8ed53fd612934d7cd4504a6b7
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-09-12 08:50:36 +00:00
Christian Stenger
6808c891fb Tests: Fix expectation for parent of COM port
Keep expected path in line with result when using QFileInfo.

Change-Id: I8d323212d1627b81de01582c368a4e9ffbba734c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-09-12 08:50:22 +00:00
Leena Miettinen
31e0088223 Doc: Make description of "Rebuild" function apply to all build systems
It claimed that qmake is always run, which is incorrect for CMake and
Qbs.

Change-Id: I80f72d750a02a16b26514bb868f1d0f64124ef56
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-09-12 08:34:27 +00:00
David Schulz
45cd20c4a0 LanguageClient: remove unused function
Change-Id: I2177d6d4a11bdaf9666a1e529b3231c291aa4123
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-12 08:13:15 +00:00
David Schulz
704de8d676 LanguageClient: set assist provider trigger characters just once
Instead of setting the completion characters every time after a document
was opened only set it when the server capabilities are set.

Change-Id: Ia37dc426a98aca1a4884752ac5da2659bfda53ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-09-12 07:26:51 +00:00
The Qt Project
25601fbbf0 Merge "Merge remote-tracking branch 'origin/4.10'" 2019-09-12 07:19:18 +00:00
Eike Ziller
8df0653bf8 Merge remote-tracking branch 'origin/4.10'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp

Change-Id: Iffdf48e782a734107ea170ebb3812e997cea0e7b
2019-09-12 09:08:04 +02:00
Andre Hartmann
c3b4dbe4e2 CppLocatorFilter: Fix crash in tests
Introduced by d1b997474d

Change-Id: I3d5a7cff36be362ae048ce0eb1b09bc325ec8246
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 07:07:49 +00:00
Nikolai Kosjar
3a5ca31a7e Core: Fix build
Change-Id: I6a52d3d5aa380118e7e421e8b97d263540951e8b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-09-12 06:56:34 +00:00
Andre Hartmann
b292c30a13 Core: Make InfoBar::GlobalSuppressionMode an enum class
Change-Id: I859a727196a887f7699a667fbe07e1bfead4cb2b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-09-12 06:45:06 +00:00
Eike Ziller
545552cc13 QtSupport: Remove dependency on CppTools
It was only left for the C++ category for the Qt class generation
settings.

Change-Id: I22d3f198f7b825c4a36d08d4ee28091b9e5b1f43
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-09-12 06:37:55 +00:00