Commit Graph

57165 Commits

Author SHA1 Message Date
Christian Stenger
fdde4529e8 LanguageClient: Fix condition
Change-Id: I4978fb7d28789c3888aa521b5b400e1d79f31a91
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-15 08:23:17 +00:00
Christian Stenger
c67b2e84cc LanguageClient: Perform safe shutdown of clients
This avoids running into a soft assert and is basically the
common pattern used when shutting down the client.

Change-Id: I9a2eea8d2ffe51f81d6bb78353606ef492628897
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-15 08:23:10 +00:00
Christian Stenger
b30f82d3fb LanguageClient: Sync settings on plugin initialization
Otherwise we might end up starting a second language server
when opening options page of Language Client plugin and
closing again with 'Ok' without modifying any setting.

Change-Id: I2b16436b92a0d622dc7df1b5fbdaf9f9f8e717a2
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-10-15 08:23:01 +00:00
Nikolai Kosjar
bd6f30da70 Clang: Improve debug log message
Change-Id: I82b8f4fc72614f6671815e3b1dbfad87a062ae98
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-15 07:28:22 +00:00
Andre Hartmann
892db36c26 Git: Update documentation for the branches side panel
Change-Id: Iff10716debd4e24382ed52e288d04c2dbdd86b1f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-10-15 07:17:42 +00:00
Orgad Shaneh
bdc2b4b59f Remove hard-coded disabling of debug logs
Instead, set the default level of all logs to QtWarningMsg.

The call to setFilterRules overrides the user preferences in qtlogging.ini.

Change-Id: Id5f6cd550d14ff7f45ae04c5d3110e0bafb0f072
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-10-13 16:36:58 +00:00
Orgad Shaneh
a27d4e9455 VCS: Re-add state logging
Recovers logs that were removed in
05312bfeec.

Change-Id: I4f433795917ee331623ead8f465ef26f53bed229
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-10-13 16:36:50 +00:00
Orgad Shaneh
0138b73469 VCS: Use category logging
+ clean the logs a bit.

Change-Id: I5a196f7007eb2b76bcdce4b2ac152da84698b860
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-10-13 16:36:41 +00:00
Andre Hartmann
299c777c01 Git: Fix context menu actions in BranchViews second column
m_branchView->indexAt(point) returned another model index
[column 1] than m_model->currentBranch() [column 0], if the
context menu was requested in thesecond (date/time) column.

The failed comparison then gave a lot of invalid actions
(like merge) for the current branch.

Change-Id: Icefc084c81f9b573cd151460db793d3c5a01eb2b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-10-13 16:36:14 +00:00
Andre Hartmann
81a4c1d934 Git: Simplify conditions in BranchView
index.isValid() is already checked in line 165,
so it does not need to be checked afterwards
because it is always true there.

isLeaf is only used once, so join the assignment.

Change-Id: I5f21486fd440b82d8e99be1248adf023da664c1e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-10-13 16:34:22 +00:00
Orgad Shaneh
17fa69eb42 Debugger: Translate user-visible strings
Change-Id: I8cd2c93bf6713cb1b5379228c700d36c3b71c261
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-10-13 16:33:02 +00:00
hjk
03d525a3bc Debugger: Simplify 'short int' to 'short' in type displays
Change-Id: I63946a983c4dd47e31f26e5f70a4c3c9e31c92ea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-12 14:07:56 +00:00
hjk
53228b8b0d Debugger: Add a note on LLDB 6.0/Linux type mis-reading
Code "QStaticStringData<1> sd;" ends up as "QStaticStringData<4>"
when read by LLDB. GDB is fine.

Change-Id: Ieef8d4a4c267d6e0bb45c96f8dc9c05a79b66381
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-12 11:34:53 +00:00
hjk
cd3011520f Debugger: Fix qfloat16 dumper for LLDB 6.0 on Linux
Needs some hint that floats are involved.

Change-Id: Ie6871ce3b6bb7aaff27e6c763a6002a6d0a90d70
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-12 11:24:46 +00:00
Christian Kandeler
a71bb65312 Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: Iab0a0382235c4ac2bb93782b6d4a88458b231b7d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2018-10-12 11:19:14 +00:00
Christian Kandeler
d3cc47f757 Update bundled Botan library to version 2.8
Change-Id: Ie8fb13f096a3a8658f6bde3d21f46ea453dc627f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-12 11:10:46 +00:00
Leena Miettinen
8f29b0bcde Doc: Update info about supported Android, JDK, and SDK versions
Remove limitations for debugging on Android versions that are no longer
supported.

Task-number: QTCREATORBUG-21255
Change-Id: I9d36638b9b2c47485b4aa47d0c563e6c153271e5
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-10-12 10:51:48 +00:00
Leena Miettinen
a48f20d0dc Doc: Fix section levels in "Completing Code"
The section levels should have been elevated, when the info was
moved into a separate topic.

Change-Id: I1b1592773356320f32758cac331611d73aed6106
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-10-12 08:48:47 +00:00
Eike Ziller
50d9e58ede Bump version to 4.8 beta2
Change-Id: Ie8034adcc95a188d5a78a71b303fc073ea1d6a3c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-12 08:19:23 +00:00
Marco Bubke
28007d9a1c ClangPchManager: Introduce UsedMacroAndSourcesCollector
It's a subset to thesymbols collecter so we try to share some code.

Change-Id: I058eee39289453e205f039b3850c1816f1d8ec1a
Task-number: QTCREATORBUG-21257
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-10-12 07:51:49 +00:00
Eike Ziller
cec48ea156 Merge remote-tracking branch 'origin/4.7' into 4.8
Change-Id: Ic90a78fb7be7b8eb23f250f04eb074813f2a004a
2018-10-12 09:39:54 +02:00
Jarek Kobus
c77cb96d99 Fix the unguarded-availability-new error
This fixes the following error, when using LLVM 6.0.0:
cc1plus: error: -Werror=unguarded-availability-new: no option -Wunguarded-availability-new

Task-number: QTCREATORBUG-18398
Change-Id: I243e6165cd624440eb0f376594b2f802c5c909bb
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-10-12 07:32:21 +00:00
Christian Stenger
31ed8137d6 ExtensionSystem: Remove icon from categories
It provides no real additional value and seems to
be more confusing when Qt Creator gets started with
command line options that load disabled or disable
enabled plugins.

Change-Id: I979f9ee95154af11aedd6100717043adc5e1e7a9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-10-12 05:34:05 +00:00
Ulf Hermann
6a19eebfc2 QML Debugger: Make sure to claim break points before CONNECT
Otherwise we have a race condition. The breakpoints may be hit before
they are set.

Change-Id: Iccdd64758b150acdfadc18cba88abdf841feb6c7
Fixes: QTCREATORBUG-21253
Reviewed-by: hjk <hjk@qt.io>
2018-10-11 14:42:34 +00:00
David Schulz
df08e1ee3d LSP: Store settings in the settingspage
... and keep just a copy of it in the model. This way we
can easily reset the setting model content to a preedit state
without rereading it from the user settings file.

Change-Id: Id2f094caade7c56eff48fd9abce00d687e607a39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-11 13:15:04 +00:00
Marco Bubke
414c7f9f1e TextEditor: Add Overloaded Operator and Punctation to text styles
Task-number: QTCREATORBUG-21285
Change-Id: Ib5d8aac74ff94c506f0888dff3ada802ac605af0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-10-11 12:48:38 +00:00
Marco Bubke
f2bd50c466 TextEditor: Remove defaults from Format
The default caused strange bugs because it was expected that no color was
set.

Task-number: QTCREATORBUG-21282
Change-Id: I3b520b944ffcb87838ba3e7b02e1d28b0f757679
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-10-11 12:48:26 +00:00
Ivan Donchevskii
352ac2ccf4 Utils: Fix column returned from helper function
The second function overload must also return 1-based column.

Change-Id: I1d3a58c9267e4a8c8a031c72230f963596a7bb2b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-10-11 12:13:03 +00:00
David Schulz
253f71bfab Cdb: fix std vector dumper in non python dumper
Task-number: QTCREATORBUG-21074
Change-Id: Iae78195b5bed1a6baa4515bf578d4f0b004eddae
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-10-11 11:38:50 +00:00
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
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
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
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
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