Commit Graph

44349 Commits

Author SHA1 Message Date
Orgad Shaneh
8e43a51a33 GenericHighlighter: Update from KSyntaxHighlighting
ini.xml was also changed, but I disagree with this change
(which removed ; and # as comments in ini files), so I left
it untouched.

Change-Id: I203b0d9382ed404623ea8ba6545970230f0e50ca
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-02-12 07:14:57 +00:00
Christian Kandeler
ac1d3b6583 Update qbs submodule
To HEAD of 1.11 branch.

Change-Id: Ief55ebcaab4ecee6be78df447f965cebfc5d981c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-02-09 19:49:11 +00:00
Colin Duquesnoy
2a016d05b2 Add support for nested namespaces (C++17)
Task-number: QTCREATORBUG-16774
Change-Id: I3de3ac65810213e21c9a3bafef2474d252e191f7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-09 17:54:30 +00:00
Robert Loehning
43947fb868 Clang: Compile fix
Partially reverting 7282e05554

Change-Id: I114cd7d5da9905cd6ce7e1044f848aeac369be37
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-09 17:13:10 +00:00
Thomas Hartmann
0e6bed71cf QmlDesigner: Allow priorities for resource handlers
Change-Id: If9e9ad3ebc57ba2d80f3b1e89d0643223a00fe72
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-09 17:03:38 +00:00
Robert Loehning
7282e05554 Improve translated strings
Change-Id: I7a45c6f8dcbb0e1b3c17a60823664fe1943c5654
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-02-09 16:36:54 +00:00
Christian Kandeler
8c7567c447 QbsProjectManager: Fix uniqueProductName() and productDisplayName()
These still assumed we can only multiplex on profiles.

Change-Id: Ice3dfe06c1be732ecae42db75155e930b0554b6f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-02-09 16:25:39 +00:00
Thomas Hartmann
7bca91cd23 NewDialog: Add setting to blacklist categories
Change-Id: I307ae05f08bf3bdbfc1b1a69bb10d8201ecf8436
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-09 16:23:06 +00:00
hjk
7cf1ba2855 RemoteLinux: Remove RemoteLinuxRunConfigFactory::canCreateHelper()
It's only called from RunConfigurationFactory::create() in a context
where the possible option are restricted to availableBuildTargets(),
i.e. the check always succeeds, and that's what the base implementation
does.

Change-Id: Ie05abb64da9e9c765afc8a61d83095a709bc5c68
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-09 14:30:16 +00:00
hjk
e5a3a8d189 ProjectExplorer: Remove BuildTargetInfo::displayName
This was previously intented to be used in the RunConfig Add... menu,
but this role is now taken by RunConfigurationCreationInfo::displayName.

This fixes also a regression for setups that relied on
QmakeProject::buildTargets() and a fix up empty display names later.

Change-Id: If75fc79efbdedc918a126e50c962fc188d7a3ebc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-09 14:15:54 +00:00
hjk
68526cbd19 Qnx: Remove run-time dependency on QmakeProjectManager
This re-uses what work in RemoteLinux. There's still a compile-time header
dependency due to the QmakeProjectManager::Constants::KIT_INFORMATION_ID
constant.

Change-Id: I6d6b8bbaed8ec2e80d54afe62a5a6b7f84eb37ec
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-09 13:35:37 +00:00
Ivan Donchevskii
7698d95576 CppTools: Get OverviewModel from model manager
Move ownership and add the placeholder for future clang based
OverviewModel.

Change-Id: Ia44d2c1d0db59b40239d1f7934bf37a02e4b14e6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-09 13:29:37 +00:00
Ivan Donchevskii
8389aa144a Clang: Use more generic methods in OverviewModel
Do not return Document or Symbol. Instead use Link
or LineColumn directly as return values.

Change-Id: I1863d7c3b4985ffe2ae5454622227075ebdc2de7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-09 13:29:10 +00:00
Christian Kandeler
d595896ea4 QbsProjectManager: Do not map QML debugging setting to Qt.declarative
QtQuick1 is no longer supported by Qt Creator.

Change-Id: I684ac12bca29779a18cc870e94071412edd29985
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 13:18:22 +00:00
Christian Kandeler
60a3fd59d4 QbsProjectManager: Use sensible default for enabling QML debugging
Task-number: QTCREATORBUG-19655
Change-Id: I2c330909c86c48f7c79fd2c016c41d82388e3c32
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:56:47 +00:00
Christian Kandeler
f5856f4bbc QbsProjectManager: Give build step a "linkQmlDebuggingLibrary" property
The DebuggerRunConfigurationAspect uses this property to decide
whether to enable QML debugging by default.

Task-number: QTCREATORBUG-19655
Change-Id: I71cc1127ee9d470a7cfedd424f8487f83d38db67
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:56:31 +00:00
Christian Kandeler
a343e83ba8 QbsProjectManager: Provide a FileType for QML files
This is needed later to auto-detect whether to enable QML debugging.

Task-number: QTCREATORBUG-19655
Change-Id: I9f33119c20299cd0a2e77727bbe4396fb6eb9b12
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:56:15 +00:00
Christian Kandeler
18277e7ea1 QbsProjectManager: Fix QML debugging support
The module property override needs a "modules." prefix these days.

Task-number: QTCREATORBUG-19655
Change-Id: I4d6025c479a65cf94968338884f80b0ffa5ac141
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:17:17 +00:00
Christian Kandeler
e463873d62 QbsProjectManager: Fix display of QML debugging warning icon
Due to a typo in the code, it was almost never shown, except initially
when it shouldn't have been.

Change-Id: I8d5ab3f28fddde7b996d3ca74bc69f2f549bedc1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 12:16:44 +00:00
Ivan Donchevskii
c6d4308ccd CPlusPlus: CppEditor: refactor overview model
Introduce abstract model to be able to use clang
based version of it in follow up patches.
Fix warnings and modernize source code a little.
Move OverviewModel to CppTools.

Change-Id: Idcc9bf03cad047026a456bd01063597a1eb95147
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-09 12:03:18 +00:00
hjk
9a7e7f7d42 Beautifier: Re-organize internal interface
- pimpl BeautifierPlugin
- apply "static" pattern
- remove use of global object pool

Change-Id: I7a4ab2493d5b29787aca258d1bc46ab00a697176
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-09 11:52:42 +00:00
hjk
4e4111a92d CppEditorPlugin: Partially pimpl and avoid use of global object pool
Change-Id: I1e55848a9947ff0b4bffcdca717419db8f6f2fa5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-02-09 11:52:30 +00:00
hjk
acd63756dc Glsl: Avoid use of global object pool
Also, use the opportunity to re-organize and clean up a bit.

Change-Id: I09d5635f48d98b450ffd1eb1a0e003a288cf6804
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-09 11:14:29 +00:00
Robert Loehning
fb4f3643fa ProjectExplorer: Fix comments for build/clean steps
Change-Id: I8c3f72f4a1e44c0e50bc1733a7e619502d21777c
Reviewed-by: hjk <hjk@qt.io>
2018-02-09 10:36:08 +00:00
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
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