Commit Graph

61529 Commits

Author SHA1 Message Date
Christian Stenger
18d96ba833 CMake: Fix compile with MSVC
Change-Id: I3f15a36579aa7bd77db1fd5d034c46cb22331a4f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-21 09:19:06 +00:00
Christian Stenger
9c49cb65d3 CMake: Fix compile for gcc5.3
Change-Id: I207af16d54ad14ba27780ce82208c315db8e5170
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-21 08:59:21 +00:00
Eike Ziller
52b9248385 Merge remote-tracking branch 'origin/4.10'
Change-Id: I452d5cbf27c1a0d43a890cef74cb8f0b9646bf60
2019-06-21 10:53:18 +02:00
Eike Ziller
3acbd6032f Merge remote-tracking branch 'origin/4.9' into 4.10
Change-Id: Id3bd5794a6821855c41567e8de3898d94a896ceb
2019-06-21 10:50:26 +02:00
David Schulz
307f1d8e6e LanguageClient: add support for proposed semantic highlight
implements the current proposal for the semantic highlighting
via the language server protocol.
https://github.com/microsoft/vscode-languageserver-node/pull/367

Change-Id: I857d606fcf5c782e0ea8e18e5d098edd26286aed
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-21 08:37:11 +00:00
Nikolai Kosjar
b6a9f0245b CMake: Fix warning about unsigned expression
warning: comparison of unsigned expression >= 0 is always true

Change-Id: I0a794bd7aa27a8a23094db4d95c676080b6a63b6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-06-21 07:18:01 +00:00
hjk
428b24fcb5 ClangRefactor: Suppress warnings about unused stuff
Change-Id: Ib9f25081421e6477c457786e0882322b44e80c62
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-21 06:47:58 +00:00
Tobias Hunger
66a875ac53 CMake: code cosmetics
Change-Id: Iebe736aa82bbd8f713d304d10fe6a30707b3adef
Reviewed-by: hjk <hjk@qt.io>
2019-06-20 14:41:15 +00:00
Tobias Hunger
5bcd59c94f CMake: Simplify buildkey generation
Just use the target name as buildkey. This is unique in cmake projects, so
there is no need to mangle the source directory into the whole thing.

This is a problem since different readers might report different source
directories. That will then result in RunConfigurations getting duplicated
after switching the reader types.

Task-number: QTCREATORBUG-22129
Change-Id: I849ab68f221d732341e98faa9a4e757d3a495b2a
Reviewed-by: hjk <hjk@qt.io>
2019-06-20 14:41:04 +00:00
Tobias Hunger
add60c0148 CMake: Avoid a bit of useless processing when updating the project tree
Do not pass around a list of filenodes with all the known header files.
That list gets converted into a QSet<FilePath> and then that is used.

Just generate the QSet<FilePath> directly and avoid that conversion.

Change-Id: I2444a2a6b4a1600fe476e66673a1a2e9c8900764
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2019-06-20 14:40:55 +00:00
Tobias Hunger
129c0abb5a CMake: Get some timings about the data update process
This should help to remove UI blocking by pointing to the costly
operations.

Change-Id: I8b3250e9ec5995c7b6a705337d60250554b77b53
Reviewed-by: hjk <hjk@qt.io>
2019-06-20 14:40:45 +00:00
Tobias Hunger
a3d6839162 Project: Delay acting on fileListChanged signal
This gives the UI a bit more opportunity to render after the project was
parsed.

Change-Id: Ie316f1c69cb0ebb856943a094b81b55f1aa2317a
Reviewed-by: hjk <hjk@qt.io>
2019-06-20 14:40:32 +00:00
Tobias Hunger
d6d133da42 CMake server-mode: Make sure the target's source dir is absolute
Change-Id: I3c74e3a0ee9c854e4b97826a4397579d4755d8e0
Reviewed-by: hjk <hjk@qt.io>
2019-06-20 14:29:00 +00:00
Tobias Hunger
67186c761f CMake: Add logging category for generic cmake stuff
Use the category in CMakeProject.

Change-Id: Idb19a92080884f1feff082d8e9db3ca5336b9249
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-06-20 13:47:39 +00:00
Tobias Hunger
0679671547 CMake: Better display name in project tree when parsing fails
When project parsing fails, then the project node might be non-nullptr but
empty. This case is handled in setRootProjectNode(...), where such a
node gets discarded (rootProjectNode() will return a nullptr afterwards).

In this case, do not use the project name that came in from the parser as
it might be wrong.

Change-Id: Iec11aa2d88cca7352d957f428aab24b0f1affd49
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-06-20 13:47:23 +00:00
Tobias Hunger
c61c499970 CMake: Add an option to override cmake reader type
Add an option to override the cmake reader type that is going to
be used.

By default the reader type is "auto" for autodetection, but that can
get changed in the cmaketools.xml settings file. Other supported options
are "tealeaf", "servermode" or "fileapi" and that will force that reader.

You can also set QTC_CMAKE_IGNORE_FILEAPI=1 in your environment to force
creator to ignore the existence of fileapi support in all cmake tools.

Change-Id: I2006616312090ce2909154dc1966f7a8eaa2949a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-20 13:42:02 +00:00
Tobias Hunger
a95eb53d3b CMake: Add initial fileapireader class
Change-Id: I620cba7cc1c2a5ac56789fa9770dce573c6b19cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-20 12:25:36 +00:00
David Schulz
7b6ebea648 Update KSyntaxHighlighting 5.52 -> 5.59
Task-number: QTCREATORBUG-22558
Change-Id: I2eac03b54f2c2d330ee9b5d0037ee42a6640d76b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-20 12:25:21 +00:00
Tobias Hunger
f02fcaf02c CMake: Fix WS
Change-Id: I24a265db05f4678a07f582f2e9a66ed1a17b0ac2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-20 12:22:05 +00:00
hjk
d56fa44964 ProjectExplorer: Use data member for ToolChain::typeDisplayName
Change-Id: Ia78ea3f8628b759706c5b024d687d917b203ec4d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-20 12:15:04 +00:00
Eike Ziller
bd3037464e Bump version
Change-Id: I5d2298e71837e3c146196f75a9bd1472771f1949
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-20 12:05:00 +00:00
hjk
f50da02880 BareMetal: Fix recent constructor breakage
Amends f420788465. The setDisplayType() call accidentally
ended up in the desctuctor, not the constructor

Change-Id: I63593325d0a6e3250c13b9e16781159190a238b1
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-20 12:04:46 +00:00
hjk
c7badbd701 Use more Utils::CommandLine in make steps
Change-Id: I72bbc65e0bec19a94418f1cb8bf9ba6fafbbe3bc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-20 12:03:55 +00:00
hjk
0ec860009a Replace uses of QString::sprintf()
There are patches appearing on gerrit for Qt 6 to remove the functions.

Change-Id: Ic189c0a19ddc0f84eb34a56c0861532303de5129
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-20 12:03:00 +00:00
hjk
1b4766e26c Enforce QT_NO_JAVA_STYLE_ITERATORS
We don't use them and Qt is likely to deprecate them.

Change-Id: Ib2fbb3f509081f5eb7aae6c41dd330cc57db59e1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-20 12:02:37 +00:00
Thomas Hartmann
4b886e12dd QmlDesigner: Remove shortcuts from undo redo in controls 2
Change-Id: I39c5bec7000c3af6e849b9e797da5c2b1d19e683
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-20 10:22:38 +00:00
Thomas Hartmann
3bc2c7ffdb QmlDesigner: Add dirPath to FileResourcesModel
Change-Id: I81eee65720870fbce9bd262c6d03a30d970f0ab9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-20 10:04:24 +00:00
hjk
66c2be6715 Android: Move AndroidToolChain::suggestedGdbServer to only user
Less code and casting.

Change-Id: I43e1b9f90b39a50b2fb4c35fadeb1b244dbe9930
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2019-06-20 10:03:46 +00:00
Thomas Hartmann
ac685f2cb8 QmlDesigner: Remove shortcut from Controls2
Change-Id: I4ba9b6d2892ef277f7b56d710edb08a202a81ed6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-20 10:01:50 +00:00
David Schulz
db409c770c ProjectExplorer: Fix initializer list in suggestedMkspecList
Change-Id: I0ff6c957688551af4a13311fff819ebba3cb41f3
Reviewed-by: hjk <hjk@qt.io>
2019-06-20 09:51:05 +00:00
Eike Ziller
5455234308 Merge remote-tracking branch 'origin/4.10'
Conflicts:
	src/libs/utils/consoleprocess.h

Change-Id: I771630cb4dc60a9e87e9d30d6295040c27348d8c
2019-06-20 11:03:05 +02:00
Christian Stenger
3e37a93c2e QmlDesigner: Fix compile with namespaced Qt
Broke with 376c6b9d59.

Change-Id: If98cb76aa5c68c7c2ada5578ab58c37956617c19
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-20 08:20:44 +00:00
Tim Jenssen
a3fb2051ad QmlJS: Fix code re-formatter for property
Fixes: QTCREATORBUG-22515
Change-Id: Ie560f8cf9e43081a37f2210ea2f6df741f14ced6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-06-20 08:19:10 +00:00
Tim Jenssen
44f1d18307 qmljs: sync parser with current 5.12 state
Task-number: QTCREATORBUG-22474
Change-Id: I86d7ee7cc28e95f814f2ba36551a36c8a59e1a79
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-06-20 08:18:53 +00:00
David Schulz
ea727e6c82 TextEditor: add additional formats setter to semantic highlighter
The old setter incremental applies formats to the semantic highlighter,
in contrast to the new setter, which removes all old additional formats
and then applies all passed formats.

Change-Id: If8569c180d8eaef7aee99509c84a03ba362c9e4a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-20 08:15:49 +00:00
hjk
76046ee865 ProjectExplorer: Make MsvcToolChain::suggestedMkspecList() more direct
... instead of the "there's a default, except when there isn't".

Change-Id: I9a0718ff6faf6ff7465e07da4e28ddb6210379e7
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-06-20 07:17:24 +00:00
Thomas Hartmann
3333f1b8ac QmlDesigner: Check if property exists before reparenting
Change-Id: I503abbbf8e9312d66567529d0bde66f0090b6f70
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-20 07:09:19 +00:00
Thomas Hartmann
dfc5e76830 QmlDesigner: Some support for non default properties in navigator
* Using hints to determine if properties/nodes should be visible, even
  if they are not in a default property.

* Using hints to add items to properties that are not the default property.

Change-Id: Iab461287807d0c82a535b7d182b989e42f96d21c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-20 07:09:10 +00:00
Thomas Hartmann
3a7a1c5e81 QmlDesigner: Add createQmlObjectNode()
The item library can also create pure QtObjects now.
This should be reflected in the API.

Change-Id: I58f8306232137c9feecf51d0abb938191c0a113a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-06-20 07:08:10 +00:00
Tobias Hunger
0026d3dc3d CMake: Keep more accurate information on build types
Do not map anything vaguely library-related into DynamicLibraryType. This
will prevent creator from e.g. trying to deploy ObjectLibraries.

Change-Id: I34a0d981d2a949f587e1804268cc66231aedd545
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-19 14:45:32 +00:00
Christian Kandeler
39e3294a8c SSH: Log some more information for sftp sessions
Change-Id: I9065866920b964a32e9b5b6204a6e42bc15acdfe
Reviewed-by: hjk <hjk@qt.io>
2019-06-19 14:39:51 +00:00
Cristian Adam
60c2aae023 qtcreator: Set thread pool stack size to 2MiB
Visual C++ sets 1MiB as stack size, macOSX has 512KiB.
Both crash with a specified project.

MinGW sets 2MiB as stack size, the specified project loads
just fine.

Fixes: QTCREATORBUG-22496
Change-Id: I6f19e74a681977e4fe1dceee292ea9c838999a1a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-06-19 14:38:49 +00:00
Christian Kandeler
019447c535 New class wizard: Add Qt module dependencies, if necessary
Provide general infrastrucure and implementation for qmake.

Fixes: QTCREATORBUG-16067
Change-Id: I8c6368fe2724c9450dcbc3410b6ca459bbbdc043
Reviewed-by: hjk <hjk@qt.io>
2019-06-19 14:06:49 +00:00
hjk
f420788465 ProjectExplorer: Make Device::displayType a data member
Change-Id: If650f660e3b10bc28d575ded07a854f59be26f87
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-19 13:44:30 +00:00
Tobias Hunger
e2d6c0bfea Project: Avoid copying the entire files(...) list
Avoid copying the entire list of files known to a project just to
filter out a couple of files from it.

Change-Id: I58b2e323f9678058ba482353eb777a55189fe05d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-06-19 13:40:28 +00:00
Christian Kandeler
77c90f0856 Project wizards: Fix project node assertion
Change-Id: I864139747ee6b5e7cb1ac4d59d2b11219750ddde
Reviewed-by: hjk <hjk@qt.io>
2019-06-19 13:38:07 +00:00
Knud Dollereder
c03c77b9c4 Fix build on macOS
Change-Id: I605fdbb4e3b866050f5a31fe141beaee1be5536e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2019-06-19 12:22:11 +00:00
David Schulz
30df84e177 TextEditor: directly create format range for result
... instead of just the text char format.
Preparation for another way to set extra additional formats to the
highlighter.

Change-Id: I3635853ee8f4b432ffe48a4a4ebe0e790be603b1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-19 11:57:58 +00:00
David Schulz
2eddd65596 TextEditor: add convenience function to clear all extra highlights
Change-Id: Id3a3c45041a23ba100447d926ed6ab829abbc92b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-19 11:57:47 +00:00
David Schulz
c05ec2833e TextEditor: explicit cast unsigned to int in semantichighlighter
Change-Id: Icb279331f1d8b0da068a46c59d9eeb8ea46c1549
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-06-19 11:57:36 +00:00