Commit Graph

44349 Commits

Author SHA1 Message Date
Eike Ziller
7f626b1182 Merge remote-tracking branch 'origin/4.5'
Change-Id: Iceaa4ca40b5318744bde8a76c6d3ccca08df71bb
2017-10-25 16:07:21 +02:00
Ivan Donchevskii
81f5c1c8ec Clang: implement globalRename based on clang Index
Has the same limitations as findUsages.

Change-Id: I8de4df2ecbfd8a4f3073666994398dc43af0d73c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-10-25 13:35:48 +00:00
Orgad Shaneh
175afabbd7 Cdb: Do not crash if no device is set
It still fails with a soft assertion, but at least doesn't crash.

Task-number: QTCREATORBUG-19160
Change-Id: I3779f64e752abf9d3779219552a4a1be648f1dea
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-25 13:27:19 +00:00
Orgad Shaneh
c0bffe1db5 ProjectExplorer: Add compiler path when running GCC
Running it from another directory without having its directory in PATH
fails on Windows because it cannot find libwinpthread-1.dll.

Change-Id: I96b976942ace48120b69001f5dddd573195bdfb4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-25 10:49:32 +00:00
Eike Ziller
1a1681bbcc TextEditor: Work around linguist issues
lupdate has issues with resolving non-trivial uses of "using namespace"
(QTBUG-64007)
Move "using namespace" directive to a place where it is better handled
by lupdate.
Also use TextEditorWidget instead of *Private as the context.

Change-Id: I7d3bb8e1bc493196e47085827be31f97e0dce7b8
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-25 07:13:45 +00:00
David Schulz
3bea291427 DiffEditor: Remove indirect call to firstVisibleBlock
Change-Id: I37db7e280ea9f327ff8ab33b0f9b1fee813fcba9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-25 06:21:32 +00:00
David Schulz
56260add50 DiffEditor: remove unused member of SideBySideDiffEditorWidget
Change-Id: Ic46fe95bc493c9242b0896737fb324f3816cc0d4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-25 06:21:25 +00:00
Nikolai Kosjar
9d19397994 CppEditor: Simplify CppHoverHandler::identifyMatch
Diagnostic tooltips for the built-in code model were determined with the
help of editorWidget->extraSelectionTooltip(), which iterated over all
extra selections. Rely on CppElementEvaluator::hasDiagnosis() instead,
which looks only for the relevant selections of the category
CodeWarningsSelection.

This is not supposed to change any behavior.

Change-Id: I7aea678b347a94a00610057180e305921234b580
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-25 06:20:15 +00:00
Eike Ziller
ab1107c497 ModelEditor: Fix another const vs non-const iterator mismatch
Change-Id: I9101b26d8c18ec73fe122ec334299202a76d24b4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-24 16:08:53 +00:00
Orgad Shaneh
cf72850cc3 ProjectExplorer: Remove unused context menu for subproject
Revealed by bae73e7246.

Change-Id: I93e098f595981f31233aeea366709fb428669ccb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-24 15:02:20 +00:00
Eike Ziller
125604c80c ExtensionSystem: Work around linguist issue
lupdate has issues with resolving non-trivial uses of "using namespace"
(QTBUG-64007)

Change-Id: I1edbd74ecc97476b961fd3c741f1a3d3f22a2bf7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-24 14:36:16 +00:00
Eike Ziller
4d0bf8a093 Android: Fix translation issues
Add missing Q_OBJECT macros

Change-Id: Ic2b01374e4426a7c90e9a8b4c3676e00c200300d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-24 14:36:06 +00:00
Eike Ziller
50e9c18c6a CMakeProjectManager: Don't use typed enum where it is unrelevant
It confuses lupdate (QTBUG-36589), and is totally unrelevant in this
case.

Change-Id: I65444fcdb62b7d95de9f22025272508aa3bf272e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-24 14:31:35 +00:00
Eike Ziller
19bb8e34f8 ProjectExplorer: Fix translation issues
Add missing Q_OBJECT macro, use sensible contexts, and use "simpler"
namespace resolution (for QTBUG-64007)

Change-Id: I2417a7a40e8ba0ff4bfdff34d2a4c57d8dcdeb00
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-24 14:31:15 +00:00
Christian Kandeler
9a493f8b83 Fix using (local) custom run configuration with non-Desktop kits
For targets such as remote Linux, we would run all run configurations on
the remote device, even "custom run configuration", which is explicitly
intended for running locally.

Task-number: QTCREATORBUG-19121
Change-Id: I83d6bdd8a47440047d230266845286715432604a
Reviewed-by: hjk <hjk@qt.io>
2017-10-24 12:30:01 +00:00
Eike Ziller
14e6a30ebf Debugger: Work around linguist issues
It gets confused by templates that use "class" (QTBUG-55478), and by
certain complicated namespace usages (QTBUG-64007).

Change-Id: I6029922344f6718b5893dd07daee0953366c442e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-10-24 12:25:09 +00:00
Ivan Donchevskii
4d90477e02 ClangRefactoring: fix names collision
Type in 'using' had the same name as it's templated base

Change-Id: I0c36e1da26930ebd5ed04b2892ec551294bc7111
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-24 11:50:18 +00:00
Tobias Hunger
a646196011 Session: Fix (un)loading of projects on session change
Task-number: QTCREATORBUG-19078
Change-Id: I4f527cb3af9b9270a65da1e283e8a1f3db737531
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-24 11:14:13 +00:00
Tobias Hunger
4acb16272d CMake: Enable switching between different temporary CMake configurations
This got broken when moving the BuildDirManager from the BuildConfiguration
into the Project itself.

As a side-effect this patch also fixes the persisting of cmake state.

Task-number: QTCREATORBUG-19075
Change-Id: I1fc696097b09f5285e67f20885eb1fa27504990b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-24 11:13:42 +00:00
Tobias Hunger
79226a66eb CMake: Fix header size in CMake configuration view
Stretch the first column, not the second:-/

Task-number: QTCREATORBUG-19128
Change-Id: I0d2e945b14b83d5449af50016fb2ef6ad19da871
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-24 11:11:53 +00:00
Tobias Hunger
de8e139413 CMake: Show "CMake Modules" node in simplified project tree
Show "CMake Modules" node in simplified tree. That keeps all the
Qt cmake code from mixing with the real project files.

Task-number: QTCREATORBUG-19040
Change-Id: I1a12c7f64db2c06982de1c66a6e54e4d936ae784
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-24 11:10:47 +00:00
Tobias Hunger
3f73f3a4f4 CMake: Fix "CMake settings have changed on disk"
* Improve the UI by showing settings in CMake and the project
* Fix setting CMake configuration to project

Change-Id: I6e127344551fa00f3f7e6170465cb3dda2e4a634
Task-number: QTCREATORBUG-17555
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-24 11:10:30 +00:00
Ivan Donchevskii
050b4dd2f5 Clang: implement findUsages with existing index
Functionality is limited to the abilities of
current index which is not updated and is
generated only at project open.
Search box temporarily doesn't allow to "Search again".

Change-Id: Id1047f27ad0aafc901f06aa51ad38ceab95eaebb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-24 10:46:52 +00:00
Robert Loehning
263cdc0397 ScxmlEditor: Remove unused variable
Change-Id: I32218cb3cc24232240b1f81e745e815017f6252b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-10-24 10:29:30 +00:00
Ivan Donchevskii
1184792fe7 CppTools: remove ambiguity in Usages class name
Usages class is used in findUsages and globalRename in further changes.

Change-Id: I2f314e4ebe7828e59fcc3cae824893c96eb21cab
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-24 10:18:27 +00:00
Leena Miettinen
f4cd9cdb6a CMake: Fix UI text
Change-Id: I3587084925089c7bb7ffb9cfb09f6b822b215cd8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-10-24 08:47:52 +00:00
Eike Ziller
e174969c15 HighlightScrollbar: Avoid creation of unneeded temporary container
Change-Id: I764f8f376b4a626d5258abb2fdd4ec7484b2c8c9
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-24 08:43:51 +00:00
Eike Ziller
867d401b82 ClangQuery: Fix translation issue
Change-Id: Ide0f4dc7239227ba0c20a0ed7b759b15283ccd92
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-10-24 08:19:10 +00:00
Eike Ziller
cd93f624da VCS: Fix translation issues
Change-Id: I3d85a3fc9d34144ca30ef1e37b22bfe7874b8e64
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-24 08:12:11 +00:00
Eike Ziller
56a37d6722 Utils: Fix translation issue
Change-Id: Ib3b87e3ae24127062247330dae1ca9b031930044
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-10-24 08:10:44 +00:00
Eike Ziller
9fc08936e6 QmlDesigner: Fix translation issue
Change-Id: Ia7858ef275fdee8a2721fb63e772b27097e0c19e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-23 18:55:06 +00:00
Robert Loehning
7dad30f160 QmlJS.PropertyReader: Remove unused variable
Change-Id: I4b90ca969a911436057debfa7dc38918b89c8fb0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-23 18:54:47 +00:00
Robert Loehning
f6109b74de QmlDesigner: Remove unused variables
Change-Id: I66784f38fe91f42d5bc478fd41ee82c443ec0dbc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-23 18:54:25 +00:00
Marco Bubke
b9d268977e Clang: Add usage functions to symbol query
Change-Id: If68a5119c863e616fea40275136d028abcf441f3
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-23 18:13:44 +00:00
Marco Bubke
0a3df84533 Sqlite: Use string view as result value
String view is returning simply the string pointer and the size from the
database. In that way we remove useless copies to an intermediate data
type.

Change-Id: I3354061938c52df585e91054a97c900ae4cd39b3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-10-23 18:03:32 +00:00
Robert Loehning
7a8d1aca1b FakeVim: Remove unused variable
Change-Id: Idc45215175702feb6521e872a566462b6e085a42
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@qt.io>
2017-10-23 13:47:43 +00:00
Robert Loehning
289dbab200 TextEditor: Initialize PaintEventData::rightMargin
Change-Id: I64690e594cf20f073ba348f5896a8cf9da5260b8
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-23 13:35:40 +00:00
Eike Ziller
d50ffd0f3c Qbs: Fix translation issue
Change-Id: Ib8408e05b168657031fd15d17a9e3f25e501be88
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-10-23 13:07:27 +00:00
Eike Ziller
15c62e360b TextEditor: Fix translation issue
Change-Id: I6f3675c7445987c31c96d409eaee63c94a47472a
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-23 13:00:37 +00:00
Ivan Donchevskii
b10f8484c7 CppTools: merge CompilerOptionsBuilder with Clang one
Since it's never used for other compilers.

Change-Id: I9512692d1dc9f9a701ea2453b7d50005478bed5d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-23 12:46:34 +00:00
Christian Kandeler
3bcbcfa626 Add qbs project files for some clang-related tools and plugins
Change-Id: I4882be50c6b007715f7b281f95d111abc5cda62a
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-23 12:18:34 +00:00
Eike Ziller
640ba75dfb Welcome: Fix translation issues
Change-Id: Ic244a1669ea210bef4a969103b0ad580faf869e8
Reviewed-by: hjk <hjk@qt.io>
2017-10-23 12:05:39 +00:00
Eike Ziller
9d1c919713 CPaster: Fix translation issue
Change-Id: Ic01818e3789d9d4bc2c8ebded167e1e81c798133
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-23 12:05:29 +00:00
Eike Ziller
7115fc3dc7 Debugger: Fix translation issue
Change-Id: I6e34f5f29c130eec9b25562b7a982ed0ff99781e
Reviewed-by: hjk <hjk@qt.io>
2017-10-23 12:05:19 +00:00
Nikolai Kosjar
f19facd378 Clang: Add more CLANG-UPGRADE-CHECK markers
Change-Id: I9ee553f29fa7a7f60291e2d7d2a56062dc722b9d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-23 11:02:18 +00:00
David Schulz
0c0c10b167 TextEditor: Fix block for visible row calculation
Take into account that a block can contain multiple visible rows.

Change-Id: Ifedeb113b3c1a6a374fa9418106e612c56559cba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-10-23 10:58:18 +00:00
David Schulz
b1a3c0bba4 TextEditor: Restructure TextEditorWidget::paintEvent
Splitting the paintEvent method into various sub routines to increase
the maintainability.

Change-Id: I4aa7a52aa6e20279654784b55f92053d6ede00be
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-23 10:58:08 +00:00
Christian Stenger
81e0092a0e AutoTest: Do not keep partially checked when switching projects
Root items that have a partially checked state would keep the state when
switching projects until manually modified or if new items would be
added on a next parse. Reset them to checked state instead.

Change-Id: Id543edd7694abc6fcec3b8d028dce2ee82213517
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-10-23 10:03:21 +00:00
Eike Ziller
5639144466 ClassView: Avoid mixing const and non-const iterators
Change-Id: I27e35b0225345de7b335dd8ac3a1af5fd5cf164e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-10-23 09:57:06 +00:00
hjk
9f690d814f Debugger: Move start dependency on PortsGatherer to GdbServerRunner
It's always needed and GdbServerRunner knows the PortsGatherer.

This also makes the setup more similar to the QNX PDebugRunner setup.

Change-Id: I5863d2c77cd5c92d0f25682d655c9901b8939c30
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-10-23 09:17:01 +00:00