Commit Graph

57214 Commits

Author SHA1 Message Date
Orgad Shaneh
4c27b0e6e7 Git: Disable merge tool execution for vimdiff
vimdiff requires a terminal, which is not supported in Qt Creator.

Fixes: QTCREATORBUG-21147
Change-Id: I6168ac9c4a03061a64a1699fca6f39c90df5168b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-11 10:42:19 +00:00
Ulf Hermann
167491c0e7 RemoteLinux: Remove empty remotelinuxutils.*
Change-Id: I41dda4b358d042b3857c90527f386133e6d425e2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-11 10:24:18 +00:00
Ivan Donchevskii
4c055491ef Revert "Clang: Merge channels from clangbackend on Windows"
This reverts commit 179d8dce73.

It causes random crashes caused by different QProcesses so revert
until we find a solution for that.

Change-Id: Id42f996f54aa5926191f02f9b881ba72eb94689e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-10-11 09:11:07 +00:00
Eike Ziller
7af8e9b3b4 Merge remote-tracking branch 'origin/4.8'
Change-Id: I8acb6582890fb2e103996cc4987f7543d22d7108
2018-10-11 10:41:25 +02:00
Leena Miettinen
9e781a1b19 Doc: Describe configuring merge tools
Qt Creator only supports graphical merge tools

Change-Id: I282613a03ba2ff91e82b4bafe5d95164495231f8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-10-11 08:24:57 +00:00
Nikolai Kosjar
d8768c0c6d Clang: Remove explicit ClangHoverHandler::ClangHoverHandler
Change-Id: I131504e8f31210a928a802ad7c5dc069ac11b2f3
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 07:43:56 +00:00
Nikolai Kosjar
de975aca4f C++: Fix parsing enum specifier
The enum name has to be an identifier. For the example in the referenced
report it was a destructor, which violated invariants in the lookup
code.

Fixes: QTCREATORBUG-20952
Change-Id: Ib8c9c23d6e001368c11c6a4b80c4295559786823
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-11 06:56:43 +00:00
Orgad Shaneh
7710a35ed6 VcsBase: Fix order of toolbar widgets
Git Blame has an additional widget, which is added before the refresh
button, but it still appeared after it.

It looks like insertAction was left there for historical reasons. Replacing
it with addAction doesn't affect the widgets positions, and they're still
placed before the line/column widget.

Change-Id: Id6b658b5c3c8a8bb256e03e13536865f007d41bf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-11 06:23:55 +00:00
Marco Bubke
77b5907c57 Don't remove __cplusplus
For the indexing we need all tool chain macros. Originally it was a fix
because the C++ version of the project part and __cplusplus could be
different but now they should be the same. They will be now removed in the
compiler options builder.

Change-Id: I7ae8721a29632473e76ecedb411a6c9001e5e199
Task-number: QTCREATORBUG-21265
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-10 12:25:30 +00:00
Orgad Shaneh
5249d0c376 Qmake: Remove usage of deprecated QSysInfo::WindowsVersion
Change-Id: I2053053bbc478c22829c51147d326b312efb1752
(cherry picked from qttools/1af6dc2c8fb4d91400fddc5050166f972ae57c9a)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-10-10 11:50:03 +00:00
Eike Ziller
4a3546f58a Fix build
after a43331ba67

Change-Id: I085e6b6312f4282a0f3ee2c7d3cf806d78d37422
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-10 11:07:52 +00:00
David Schulz
c839950bae LSP: add resource file to qbs project file
Change-Id: I8aa2818dc0f9f6578d585365561d38597ecb63cc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-10 09:06:40 +00:00
David Schulz
2730fd4c48 Editor: Do not access a text document from another thread
Task-number: QTCREATORBUG-21192
Change-Id: I5c327f268da2364f1fc4f671993e8498cd0b7421
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-10 09:05:04 +00:00
Tim Jenssen
8d8aa62e4d QmlDesigner: change the import path to QtQuick2 path
Change-Id: I8adb6fdd334647dd85a8a9f95738ac22fc690363
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-10-10 08:36:04 +00:00
Christian Kandeler
b84ba427f8 UserFileAccessor: Remove unused helper functions
Amends b6c9879f41.

Change-Id: Iae5034a5afa47c671c5f9de5167b0566784bab37
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-10 08:33:17 +00:00
Christian Kandeler
dba4d7f669 CMakeSpecificSettingWidget: Remove unused variable
Change-Id: Ifc1fc41ea9949198504cafe4da12ff582b40ffdd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-10 08:32:35 +00:00
Christian Kandeler
5cb95c636d ProjectExplorer: Fix warnings about unused variables
Change-Id: I3cafc9a4c5d304d0bbbcfb345f29a35f53818a69
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-10 08:32:06 +00:00
Tobias Hunger
a43331ba67 Move "builddirectory" template from Core to ProjectExplorer
Move Core::DocumentManager::buildDirectory to
ProjectExplorerPlugin::buildDirectoryTemplate.

Move the setter along.

Change-Id: I3f1739723e800d04d2934149369b8881208305b4
Reviewed-by: hjk <hjk@qt.io>
2018-10-10 08:31:16 +00:00
Tobias Hunger
5f80bdfbcb ProjectExplorer: Unify naming scheme of widgets on settings page
Change-Id: If149d3fffa3c305ca5f69f4d5c3b0ee572c80c94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-10 08:31:03 +00:00
Orgad Shaneh
762fb5c353 Git: Make checkout asynchronous
It can be slow when many files are replaced.

Change-Id: I308698ef36973374f4526107fbda0d9ad907e707
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-10 08:30:16 +00:00
Orgad Shaneh
86732dbdc0 Git: Use correct flags type in grep
Change-Id: Iebd65827518576b48ff8f401612baae8350fe6a3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-10 08:30:03 +00:00
Orgad Shaneh
c879a78c03 Git: Fix regexp substitution with multiple occurrences in line
If the line has multiple occurrences of the search pattern, all occurrences
got the same capture groups.

For example, text:
Foo(1); Foo(2);

Search for Foo\((.)\) and replace with \1, the result was:
1; 1

Change-Id: Idd4dc21397d5331b1e31a2860eca39d9bc407437
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-10 08:29:55 +00:00
Orgad Shaneh
879a7082f8 Find: Store flags also in FindToolWindow
The flags are only preserved in history if they are updated via
Find::updateFindCompletion. This was called for the find toolbar, but not
for Find in Files.

Change-Id: I16666cc854aed043bfe01175964a4c415020557c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-10 07:41:37 +00:00
Eike Ziller
3a09687921 Menu locator filter: Fix that e.g. recent files were no longer available
Amends aed2c2c716
After checking which actions are enabled we may not trigger the menus'
aboutToShow anymore, since this can completely rebuild the menu
including recreating the actions. We also don't have to, since this
moved to before checking which actions are enabled.

Change-Id: I1108edce0818f71080b2926a1121c45de38672e1
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-10 07:34:52 +00:00
Ivan Donchevskii
179d8dce73 Clang: Merge channels from clangbackend on Windows
DebugView app can't view error channel therefore logging
output from clangbackend is not visible. Merging both
channels solves the issue.

Change-Id: Iadfd97e3ec8c48afddd880647d9c3fe1c707e241
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-10-10 07:14:56 +00:00
Nikolai Kosjar
04caf7594e ProjectExplorer: Use intervals for detecting language version
...to fix running into unknown __cplusplus values from compilers with
incomplete language support.

This amends

    Toolchains: Detect unspecified language version
    commit 5900766ecb

Change-Id: I88cca71ae66cc5d49b644e88658aaa5806862fba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-10 06:49:30 +00:00
Nikolai Kosjar
4cd527f496 ProjectExplorer/MSVC: Ignore warning options when looking for predefined macros
...since they should not have any effect on the macros. This potentially
also reduces the cache.

Change-Id: If50cfa50ce0fb29dff291bf2c329532fc6284644
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-10 06:49:19 +00:00
Nikolai Kosjar
feae30d7ad ProjectExplorer/MSVC: Cache more predefined macros
...as for the gcc toolchain. Do not cache only the "last" predefined
macros, but cache them all.

Change-Id: I404955e7419089bb03f7d354488f8b9980e8583b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-10 06:49:13 +00:00
Nikolai Kosjar
eb01565c99 TextEditor: Make "Annotation Settings" link smaller
...in annotation tooltips.

Change-Id: I67b73773544cfb86a3d11228cc349cf10f024e7e
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-10 06:48:31 +00:00
Tasuku Suzuki
4801348a31 QScxmlcGenerator: Fix typo in the logging category
Change-Id: I2e86e574bca62e7f3af0157a71792cd0f8fb131e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
v4.8.0-beta1
2018-10-09 12:54:47 +00:00
Sergey Belyashov
fd186bed20 Russian translation update
Change-Id: I40965282a75586bb23e6e42b7d82bd8532290820
Reviewed-by: Alexander Volkov <a.volkov@rusbitech.ru>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-10-09 12:47:51 +00:00
Ivan Donchevskii
76fad7aad0 Unittest: Fix compileroptionsbuilder-test paths on Linux
Match paths partially not to construct the whole path.

Change-Id: I397ac930e2d74b8eba98d1b523aabd4ed92f2aee
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-09 12:25:14 +00:00
Orgad Shaneh
acd387651e SilverSearcher: Support regexp substitution
Change-Id: I42cde61fdd052882ae84ae27466a9e79a1782398
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2018-10-09 09:17:54 +00:00
Nikolai Kosjar
2a40c215e9 CppTools: Inline ToolChainEvaluator
Change-Id: Ie5579820e4683a5e4d7d73034441d662e017b6a3
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 08:14:16 +00:00
Nikolai Kosjar
3c5dc450b8 CppTools: Remove enum duplication
Change-Id: I2eb452780c21f8d30034bcfbb3266fc8daa10802
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-09 08:14:09 +00:00
Ivan Donchevskii
74fbcd9c63 Clang: Autodetect shipped clang binary as C++ compiler
We do not ship clang++ so it makes sense to detect clang
not only as a C compiler.

Change-Id: I37b95e38f253e6407fa27397815d9bcdbbd4a8e2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-10-09 07:31:51 +00:00
Orgad Shaneh
c6dcb46357 SilverSearcher: Use nullptr
Change-Id: I6f33a8c4d746f849fd78b2da831f89dc221ddda8
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2018-10-09 06:30:47 +00:00
Jochen Becher
acb1cd33bb ModelEditor: Refactor ComponentViewController
Move some generic code into separate controllers for later reuse.

Change-Id: Idc0df32e6efe6d8618f556619fa956aded568119
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-08 17:09:16 +00:00
Jochen Becher
651f6c0b1b ModelEditor: Improve performance on finding a model delegate
Change-Id: Ide45583093d1d95c433858fc57c8c6ff772783a7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-08 17:09:03 +00:00
Jochen Becher
e07ea0c811 ModelEditor: Improve performance
Use an additional hash map finding elements on diagram faster.

Change-Id: I91adf9e3d0f79662895ffa61ca616438100529d6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-08 17:08:55 +00:00
Jochen Becher
e8625433be ModelEditor: Show base class names
The names of bases classes that are not related on a diagram are listed
in the class' top left edge.

Change-Id: I60198a0401adacf5abb6e1f6bf7bb36e67c9c7ca
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-08 17:08:45 +00:00
Christian Kandeler
a7d502a309 CppTools: Fix clang warnings about old-style casts
Change-Id: I947051dec996e92e4afe178e985374587337c4f0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-10-08 13:36:03 +00:00
Orgad Shaneh
8760c5024d TextEditor: Support hyperlinks in TextMark tooltip
Change-Id: I3fa4470fb06469286901025c350d636fcdd9410a
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-08 13:28:02 +00:00
Nikolai Kosjar
b1031d25dc ProjectExplorer: Fix build with Qt 5.9
‘qEnvironmentVariable’ was not declared in this scope.

Change-Id: Ibd5922c07a360410e006315459b35b5c45f87a9f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-08 12:55:21 +00:00
Nikolai Kosjar
6aa11eb75e CppTools/ProjectExplorer: Remove enum duplication
... between CppTools::ProjectPart and ProjectExplorer::ToolChain.

Change-Id: I8b448747e454adbed77547460383b8515462cc81
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-08 12:34:57 +00:00
Laurent Montel
167f08e2ce Allow to define a environment variable for qtc templates
Now we can load qtc templates from anothers directories.
In kde we start to provide some templates and we need
to be able to specify it.

Change-Id: I373faae7fdc3fa34ac9b3c7c57d69c1a5e4d244e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-10-08 12:33:10 +00:00
Nikolai Kosjar
5900766ecb Toolchains: Detect unspecified language version
We checked the command line from the project manager for "-std=X" and
friends to figure out the language version to use. However, if such a
flag was not provided, we assumed the latest version we support. This
could conflict with the actual version of the compiler and its
predefined macros.

Figure out the version by inspecting __cplusplus/__STDC_VERSION__ in the
predefined macros of the toolchain. The MSVC compiler is an exception to
this, as it does not seem to properly set the value - check for
_MSVC_LANG if possible, otherwise simply assume some versions as before.

While at it, add also support for C17/C18 and the upcoming C++2a.

Task-number: QTCREATORBUG-20884
Task-number: QTCREATORBUG-21188
Change-Id: I464ffcd52d2120c0208275a050e82efda44fae1c
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-08 09:07:56 +00:00
Nikolai Kosjar
9192b6b024 Add qbs files for CompilationDatabaseProjectManager
Change-Id: I892abbb7c389e2e075b1637a386e0d089a533d9e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-10-08 09:07:28 +00:00
Vikas Pachdha
ca69b8a8a8 Android: Re-install Qt live on version mismatch
Use version code to determine the app's version, version
name is only for display

Change-Id: I8e3a8f6b1b8fab2014a762ebabf09b3ce2e0b559
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2018-10-08 08:54:36 +00:00
Marco Bubke
391cfab5d7 Clang: Add progress bars for creating PCHs and indexing
Task-number: QTCREATORBUG-21112
Change-Id: Ie0c00a58f479a2fe7cbc7322490808509733ff0f
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-08 08:20:22 +00:00