Commit Graph

54564 Commits

Author SHA1 Message Date
Tobias Hunger
6f04ca6463 CMake: Do not override the displayname/defaultdisplayname
Do not override the displayname/default displayname when restoring
CMakeRunConfigurations.

Task-number: QTCREATORBUG-19762
Change-Id: Idf5e90e017a363444387e9c22812ad501aabc75b
Reviewed-by: hjk <hjk@qt.io>
2018-02-09 09:34:19 +00:00
Tobias Hunger
5a275fe531 BuildStepList: Improve reporting on failed restore attempts
Change-Id: Icb402c4b489f1ff5fe18dd36872360f29234053a
Reviewed-by: hjk <hjk@qt.io>
2018-02-09 09:34:04 +00:00
hjk
4e494debff Todo: Remove nowadays unneeded use of global object pool
Change-Id: I3ff79f44dbb1fec19053949915a9d5ef71021ab2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 08:18:00 +00:00
Christian Stenger
5409448888 QmlDebug: Fix missing include
Change-Id: I5004d1444f8106e1d557c2423eed73baca82a65d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-02-09 05:46:25 +00:00
Marco Bubke
c4220041a6 Clang: Rename FileInformation in FileStatus
It's more near to the Unix convention and it has a plural too.

Change-Id: I53f85911d8fcbaadba9947c70e9a375dc6995ed5
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 16:49:43 +00:00
Marco Bubke
6976341e4b UnitTests: Fix printing warning for not handled enumeration
Change-Id: Ie590fff1d7a18552fadb34319a1423a6e0855df3
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 16:49:33 +00:00
Marco Bubke
98774d7b92 Clang: Remove export filters
Lets try to find a better way to do it later.

Change-Id: I960abf65c910f639cc860b8e1291b0c235b7db07
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 16:49:27 +00:00
Christian Kandeler
3c0cd59059 Utils: Fix compiler warning on unix hosts
Change-Id: Iaac91d22f4df8ab15fb1ba232475bf8661d4f97b
Reviewed-by: hjk <hjk@qt.io>
2018-02-08 15:27:57 +00:00
Ulf Hermann
43a8bd046e QmlDebug: Allow retrieval of blocked engines from EngineControl
Also, don't accidentally add engines to the list on engineAdded() and
engineRemoved().

Change-Id: Ida4362eb003b85282dad17afbf0116c82f024288
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-08 14:55:01 +00:00
Nikolai Kosjar
2cedb0531c CppTools: Use radio buttons for clazy options
Change-Id: I7c307cffce58c8dc4fd00d17b5c477c85ba509d8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 14:46:05 +00:00
Nikolai Kosjar
8cd96c2142 CppTools: Improve clang diagnostic configuration UI
...by clarifying the widget hierarchy. Ensure that the combo box at the
top is perceived as the main widget:

* Remove the "Configuration to use:" label so the combo box gets more
  horizontal space and thus dominance. Also, rename the group box
  header/label from "Clang Diagnostic Warnigns" to "Clang Diagnostic
  Configuration".
* Move the command line text edit below the combo box into its own tab
  page to clarify the relation to the tidy/clazy tabs.

Change-Id: I97a0785678e33b94746046d07a911422b1469890
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 14:45:59 +00:00
Nikolai Kosjar
0629400288 C++: Do not auto-insert '}' after class/struct/enum/union
...when typing the opening brace. This restores the initial behavior
from version 4.3.

Not auto-inserting the closing brace allows the user to press Enter to
get "};" completed.

Change-Id: I8c62a08433a947e28f0555338a5fb8eeeae11bea
Task-number: QTCREATORBUG-18872
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-08 14:45:20 +00:00
Ulf Hermann
65cd490021 QmlProjectManager: Allow QmlProjectRunconfigurations on non-Desktop
This is an artificial restriction accidentally added by a previous
commit.

Change-Id: I6c3273ed3f0b9f223304ecce35e81ed6013ae275
Reviewed-by: hjk <hjk@qt.io>
2018-02-08 13:59:00 +00:00
hjk
f89691a235 QtSupportPlugin: Pimpl partially to remove uses of global object pool
Change-Id: I6c23d6220e8ca212f3785a7aff7915d7979f01eb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-08 13:22:37 +00:00
David Schulz
52b717d3d1 Editor: Fix completing functions with keywords assist
broken since ed5adb286a

Change-Id: Ic0fbdd2bcf544862d843abc83ecde8a917909c19
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-08 13:20:31 +00:00
hjk
0363e4f58b UpdateInfoPlugin: Remove one unneeded use of global object pool
Change-Id: If9e6f989de24c447fd33a1cfa3ed22d6fad6788d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-08 10:37:19 +00:00
hjk
4248c53c79 QmlJSPlugin: reorganize setup
Pimpl, remove use of global object pool, cosmetics, ...

Change-Id: I9e1415b07d7ff8e95db0998c87ce7d75ca638a8e
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-02-08 10:37:12 +00:00
hjk
5efd576020 ScxmlEditor: Avoid use of global object pool
Including some code cosmetics.

Change-Id: I6d7f11404ea489020d0c74e43cbe25cdcaa48e85
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-08 09:10:54 +00:00
hjk
abe57f73b4 DiffEditor: Remove unneeded used of global object pool
Change-Id: I7b1cd980702313e3ef2501519aa64042d4483bb8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-08 08:32:01 +00:00
hjk
231b4329df ImageViewer: Remove unneeded use of global object pool
Plus some code cosmetics.

Change-Id: I4e10f1900a5a06bb37bc2d20f3dd776c7534011e
Reviewed-by: Denis Mingulov <denis@mingulov.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-08 08:22:59 +00:00
Christian Stenger
42e224eb4b Debugger: Fix attaching to core for LLDB
Task-number: QTCREATORBUG-18722
Change-Id: I4579fff9725f4a7578642080a010ca54b221969b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-02-08 06:05:16 +00:00
David Schulz
2bfec17bef ProjectExplorer: run vcvars bat in parallel
Instead of collecting the environment differences for all
MsvcToolChain when needed, start an async job at object construction.

This reduces the blocking startup time depending on the Toolchain count
up to 8 seconds.

Change-Id: Ie004956f290d7555f88226c7f4d9f7eb37ec2261
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-08 05:52:45 +00:00
Eike Ziller
75f774a341 Remove experimental flag from ModelEditor
Change-Id: Ic4beac306d6a1198c0115e0368c0a16677576f27
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-07 20:02:02 +00:00
hjk
e3e3477307 ClangStaticAnalyzer: Remove uses of global object pool
Change-Id: I6cdfade5ecbfb48d714c6055fab733b8061369b4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-07 16:40:32 +00:00
hjk
e30c872e61 QmlDesigner: Avoid use of global object pool
Plus some code cosmetics.

Change-Id: I6fde62da5a99e750131d20336d35565280ac7bef
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-02-07 16:22:02 +00:00
Christian Kandeler
487aad1ed5 RunSettingsWidget: Skip non-matching factories
Change-Id: I8dd924d1b29ec06cf0fdd8868a8678e47de687f1
Reviewed-by: hjk <hjk@qt.io>
2018-02-07 15:10:40 +00:00
hjk
c9ceed697f CodePaster: Avoid use of global object pool
Change-Id: Ib81694d9dd3e8d040adc9ca12e9296e5cceb8208
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-07 14:23:53 +00:00
Eike Ziller
24cd0b1cd6 Add changes file for 4.5.1
Change-Id: I4b5cd0eb7675e2fb3396668517a587e7496608ec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
v4.5.1
2018-02-07 14:23:39 +00:00
Nikolai Kosjar
e48d8afedd C++: Check previous lines for auto insertion of closing brace
If '{' is typed, we check whether '}' should be auto-inserted.
Previously, we did this by only looking at the tokens of the current
line. By using the BackwardsScanner we can easily look also at the
previous lines, which fixes e.g.

  namespace N
  <CURSOR> // type '{' - no '}' should be inserted.

Change-Id: Ib2c2989c33f87464431d45facf986bcbb2eff2f8
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 14:22:38 +00:00
Ivan Donchevskii
c020f2448b CPlusPlus: Add toLink method to the Symbol
Basically move it from CppTools to CPlusPlus
to be able to use it there.

Change-Id: I0af80f93bdc029824397ceafdf940cb86c4382b0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-07 14:01:52 +00:00
Tobias Hunger
31f1713c75 ProjectTree: Do not register action more than once
Change-Id: I9d9c86694cd8066ba4be2a065805a3b52bc272ff
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-07 13:42:50 +00:00
hjk
87543118d5 CppTools: Apply 'static' pattern to StringTable
This also fixes a crash on loading (some?) projects introduced
in 577bf7c08a.

Change-Id: Ie35d466fa3b84b183118fe93f55393a4c59755de
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-07 13:32:08 +00:00
Tobias Hunger
d5cd95c702 CMake: Fix warning about unused parameter
Change-Id: I008a9e6193503a2d2761675921b6bc673ea5333d
Reviewed-by: hjk <hjk@qt.io>
2018-02-07 13:21:46 +00:00
Eike Ziller
b99755fdb0 Version bump to 4.6-rc1
Change-Id: I87c6a2452ad5ef86eb3146373a11124f3a199b32
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-07 11:38:39 +00:00
Nikolai Kosjar
f75983b0aa TextEditor: Modernize texteditor.{cpp,h}
Apply some clazy and modernize fixes from clang tidy: mostly use of
nullptr and removal of type duplication.

Change-Id: Ibd9ee8f9b8a836a40d6f9be0b95acc91513a1a01
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-07 11:36:53 +00:00
hjk
940824ddee QtSuppport: Remove unused static function
Change-Id: Ifa884a440581c77f6d99ad6ee0669b8e5eb4aeda
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-07 11:21:49 +00:00
hjk
577bf7c08a CppToolsPlugin: Partially pimpl and remove use of global object pool
Change-Id: Iee09bf2fc7c945b8dcf950edfe94889d35c63735
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 11:20:22 +00:00
hjk
5e55c1e947 Welcome: Detach Welcome page registration for global object pool
We require individual pages to be provided in Plugin::initialize()

Change-Id: I431112b523ed4cc803c07e5c6df8aa8d4ed1663b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-07 11:10:56 +00:00
hjk
b16019c95b CppTools: Remove an unused declaration
Change-Id: I165f32678d61e3731fff68982bdb3f5c1791b1f0
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-02-07 11:10:45 +00:00
Hannes Domani
ac8f2b8302 Valgrind: Open help for heob
Change-Id: I9cc7dfc2553f445784d3bb86378e2db28f70902c
Reviewed-by: hjk <hjk@qt.io>
2018-02-07 11:07:20 +00:00
Eike Ziller
2ce37a86ef Merge remote-tracking branch 'origin/4.5' into 4.6
Change-Id: I3ab4084095d90daf064475157b9a3cdce56dbdec
2018-02-07 12:03:43 +01:00
Eike Ziller
5432dd1f5c Merge remote-tracking branch 'origin/4.6'
Conflicts:
	src/plugins/coreplugin/locator/locator.cpp
	src/plugins/imageviewer/imageviewerplugin.cpp
	src/plugins/remotelinux/remotelinuxplugin.cpp
	src/tools/clangbackend/source/tokeninfo.cpp
	tests/unit/unittest/data/highlightingmarks.cpp

Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67
2018-02-07 11:58:23 +01:00
Alexandru Croitor
cb5ee3a9cb Make valgrind-fake target be a QtcTool
Change-Id: Icb572cac15224f1820851f8df0f13a99a7eed61c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-07 09:49:17 +00:00
hjk
d3bb3c0953 TextEditor: Use a non-static d-ptr
Change-Id: I21ae4599f152964166c65095996e3fc4ac417ba5
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-07 09:46:10 +00:00
David Schulz
3c2ad7eed9 QtSupport: move example image loading from delegate to model
Change-Id: I287336b4d36d648666093a4894ab131b8999ca98
Reviewed-by: hjk <hjk@qt.io>
2018-02-07 09:40:31 +00:00
Leena Miettinen
631d9cd711 UI text: Fix grammar
Change-Id: I39fd5db51e3228de34c028993416f66fce9962da
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-02-07 09:29:46 +00:00
Christian Stenger
109c3f06f8 TextEditor: Fix compile with Qt5.6/gcc4.9
Amends 91c19c2734.

Change-Id: I556c2336ac2bbde7f7f2acf4ed9339809a918b55
Reviewed-by: hjk <hjk@qt.io>
2018-02-07 09:06:53 +00:00
Vikas Pachdha
267e938191 Android: Fix empty output tab header and run configuration name
Task-number: QTCREATORBUG-19711
Change-Id: I5dc97129fa2e37360b9d74d99888703e049b9049
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2018-02-07 08:27:33 +00:00
Leena Miettinen
7797a2ba63 Heob: Fix UI text
Fix issues in writing style and punctuation.

Change-Id: I68da7960ccb5876ec8baf3b8eab1ab7e0d475a77
Reviewed-by: Hannes Domani <ssbssa@yahoo.de>
Reviewed-by: hjk <hjk@qt.io>
2018-02-07 08:17:07 +00:00
Christian Stenger
921c4b9aa2 Utils: Fix compile with Qt lesser than 5.10
Broke with 79a43b4d86.

Change-Id: I9e7c9dc02c917b0ec3672b296e673212b16e835d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-02-07 08:10:15 +00:00