Commit Graph

57165 Commits

Author SHA1 Message Date
hjk
8c713d45a8 CMake: Use new ExecutableAspect
Change-Id: Ic880351802c52b61c53c6730d23dfe3f124ebc44
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-29 14:27:14 +00:00
hjk
1c006e406f ProjectExplorer: Introduce and use a ExecutableAspect
... to hold the label with the executable's name in the
RunConfiguration widgets.

This basically follows suit on {WorkingDirectory,Arguments}Aspect,
allowing for some centralized handling of decorations on invalid
names etc.

Implementation is even simpler as this is read-only and not saved
in settings envisioned use cases.

Change-Id: I20c5c19e5f19ba8367afc0d04ed2ac3681e6491d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-29 14:27:06 +00:00
Eike Ziller
b8eea8f9f8 Locator/JavaScript: Fix min/max with more than 2 arguments
Pass a variable amount of arguments along

Task-number: QTCREATORBUG-20167
Change-Id: I3643aca8c18cba14beb8d625b62f45aa4b39d2a4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-03-29 10:51:45 +00:00
BogDan Vatra
aa2ea72679 Add stdcpp NDK paths to soLibSearchPath
It's useful when the application uses std::abort & co to get
a useful callstack.

Change-Id: I805478333bac3eba21db158df52942599a80c088
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-03-29 10:18:27 +00:00
Eike Ziller
454e9ee5ca Add Context Help to text editor context menu
For this make the default context menu for the text editor extensible
and add the context help item from the help plugin, which now has an
optional dependency on the text editor to ensure correct loading order
if both are present.

Task-number: QTCREATORBUG-55
Change-Id: I378a491ba3700e65fc262bdb10c8ead5ad62cb33
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-03-29 08:26:24 +00:00
Eike Ziller
26bfa469db Fix that clearing shortcut in settings did no longer work
This broke in 8d1a592d16

We should ask the validator of a fancy line edit if an entry is valid,
also if the line edit is empty and shows a placeholder text, even if we
then do not mark the place holder with the error color, etc.

In case of the shortcut settings, the validator has side effects that
are important.

Change-Id: I41c0d98ed3c6e9e68df4484a47c108b00ddbbfe7
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-03-29 08:03:15 +00:00
Eike Ziller
3ef455da18 Shortcut settings: Simplify code that extracts shortcut item
Change-Id: Ib9e6c11ea26c09837629ac2ef1c1dff0def1a9dd
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-03-29 08:03:02 +00:00
Marco Bubke
ff1ce3a475 Clang: Honor directories for the file name
The file name id must be unique for very entry, so the directory id must be
incorporated too. Now there is always one unique integer id for every
file path. The directory id is there to access and compare the directory
much faster but not provide any data to the uniqueness of the id.

Change-Id: I0f9a2ca70bc9dda0ce32ebc45eb7b082821eb909
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-03-28 14:01:12 +00:00
Tim Jenssen
2e25ce32cb QmlDesigner: fix crash on exit
Change-Id: I2e72699dd3f49c917a28d724753e27701a930fac
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-03-28 13:16:23 +00:00
Robert Loehning
d424fb36f1 Clang: Don't dereference nullptr
Change-Id: Ib36c2d18fd01684cad45042b9f1a6901a028b345
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-03-28 13:12:15 +00:00
Tobias Hunger
530fc225fa Project: Use std::unique_ptr for root project node
Change-Id: Ice101fa57c5ee09a58dc6c99f6716fa4919ade59
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-28 13:11:32 +00:00
Nikolai Kosjar
39306d55eb Clang: Fix build with QTC_NO_CLANG_LIBTOOLING
Change-Id: I8b3f4db10c43fc1620b765933915e3c4fd0a594a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-03-28 11:47:52 +00:00
Eike Ziller
603b031ab2 Version bump to 4.6.1
Change-Id: I814d2b864dff341977a41c4d03d96de465a72775
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-28 10:11:53 +00:00
Eike Ziller
5cc24f9ac1 Merge remote-tracking branch 'origin/4.6'
Conflicts:
	src/plugins/projectexplorer/msvctoolchain.cpp

Change-Id: If2116aa2dbfdb9d07088595e791f8fa706b39e00
2018-03-28 10:01:44 +02:00
Eike Ziller
1e1c212090 Use QTCREATOR_COPYRIGHT_YEAR for documentation
For this the offline style overwrites any footer that was set in the
qt-html-templates-offline.qdocconf from Qt.

Change-Id: I8a8f7048445bc03a72b19df6c60b7cea680c5803
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-03-28 06:45:51 +00:00
Marco Bubke
de4f6301e6 Clang: Process SymbolKind and SymbolTags with the indexer
We add the infrastructure to compute the SymbolKind and SymbolTags in the
indexer. Later we have to add more for templates, virtual functions etc..

Change-Id: I9203c5cfbfffed3065337292010de5fce5736453
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-03-27 14:45:58 +00:00
Marco Bubke
a8b11cb2c5 Clang: Improve access to caching structure
The clang file id is counted from zero, so it better to use a vector
instead of a hash with all the overhead.

Change-Id: Iaf201898e9e16005d196b5b49065f15f9d3d2dfa
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-03-27 14:45:41 +00:00
Marco Bubke
576eb3370c Clang: Use the clang indexer for indexing
It is not removing so much code but will makes somethings easier in the
future. We added the SymbolType::Definition too.

Change-Id: I4e106b8518e6bfed0c6a4aa6be61c4a5fe5f8bef
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-03-27 14:45:35 +00:00
Leena Miettinen
3616725049 Doc: Increment copyright year in doc HTML file template
Change-Id: I281c907e2ee6593bed7854385e9b6f1ca5f169cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-27 14:12:58 +00:00
Ivan Donchevskii
41a12410e6 Clang: Fix initial tidy settings tab
When no settings exist it has to be disabled.

Change-Id: I1cb8368edf182fa616930f5718323c8e03a0e649
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-03-27 13:54:06 +00:00
Joerg Bornemann
af939831f8 ClangSupport: Fix qbs build after incomplete refactoring
Remove files that are not supposed to be built anymore.
These were removed from the .pro file, but the .qbs file
picks them up, because it uses wildcards.

Change-Id: I457044147153baadcc223ff7e9d6b5497dd80fc0
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-03-27 12:41:35 +00:00
hjk
3bce4b9af2 QmlProject: Use new helper function to create run configuration widgets
Change-Id: I471fe60d25bb3d8ca3ebf2d2abe8e725bc7daa56
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-03-27 12:33:51 +00:00
Ivan Donchevskii
c93e2815c7 AutoTests: Fix build after ClangStaticAnalyzer plugin rename
Change-Id: Ic34633f98e6c3c1b73389802429f3011e87b301e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-03-27 12:33:31 +00:00
hjk
116f7db28c iOS: Use base method to list run configurations
The base method is good enough nowadays.

Change-Id: I1affc678a2168d002ed8f627a56f172e30c1c0be
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-03-27 12:31:45 +00:00
hjk
40730a4eb2 Android: Use base method to list run configurations
The base method is good enough nowadays.

Change-Id: I8e7e9acbade239ff0dce4ac594b62d23cc5522cb
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-03-27 12:28:44 +00:00
Joerg Bornemann
3ac2aa7bb5 Update qbs submodule
To HEAD of 1.11 branch.

Change-Id: Ie70fa4113c1af7ba3c75c4618ded9711d3dcdaa7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
v4.6.0
2018-03-27 11:44:46 +00:00
Marco Bubke
d6df537ae2 Clang: Remove old CPP code
It was there to suppress warnings but this is now done with compiler
arguments.

Change-Id: I62edae9c115c09aa07601547159c04e038943a9b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-03-26 13:39:58 +00:00
Marco Bubke
9c4bfbe20a Clang: Improve interfaces
The interfaces should never used to handle ownership. So it is now using
protected destructors. Copy operations are forbidden too.

https://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md#c35-a-base-class-destructor-should-be-either-public-and-virtual-or-protected-and-nonvirtual

Change-Id: Ib0b60a73a7ec130973b5cb0095cc5b2f10fa0758
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-03-26 13:39:36 +00:00
Eike Ziller
985153d9cc More changes entries for 4.6
Change-Id: I968f051be1eecbb928046d37499449eeec7e05ba
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-26 13:35:46 +00:00
Eike Ziller
f1e02c0826 Fix that menus didn't show ampersands in files names
And instead interpreted the ampersand + following character as an
accelerator key.

Task-number: QTCREATORBUG-17817
Change-Id: I327239499ce56e75fd12f2df5be60d4b04913acd
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-03-26 12:02:15 +00:00
Andy Shaw
cf5075c9cd Clang-cl: Fix restoration of clang-cl compiler
compilerCommand was not restored, so isValid failed.

Task-number: QTCREATORBUG-19255
Change-Id: Idc65aaf2eaad348f05cdf4dfd057bbd10c6c4e4c
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-03-26 09:19:57 +00:00
Ivan Donchevskii
3fa8db13e9 ClangStaticAnalyzer: Rename plugin to ClangTools
ClangStaticAnalyzer is only one of the tools that
we can use and it will stay inside ClangTools plugin.

Change-Id: I74278e3fd12b792ab127d352db05d856c964968c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-03-26 06:18:12 +00:00
Arnold Dumas
66548fdb76 Icons: Remove transition helper
Change-Id: Iff8b3d50cc212ec5f40b494e455e36909fee0c80
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-03-23 18:01:34 +00:00
hjk
41a8e410be iOS: Fix compilation before it breaks
Make #includes self-contained, anticipating breakage in the upcoming
removal of projectexplorer/runconfiguration.h in qmakeproject.h

Change-Id: I7e7bc6224cde3f350d1880a97953e0e94ac5a80a
Reviewed-by: hjk <hjk@qt.io>
2018-03-23 15:16:59 +00:00
Tobias Hunger
adb169149c GenericProject: Fix adding several makesteps
Fix adding several makesteps to generic projects again. The problem used
to be that the constructor called by "Step" set a buildTarget of "" via
the delegation to GenericMakeStep's constructor and then added "all"
explicitly. So it was attempting to build two targets, with the empty
target being a syntax error.

Task-number: QTCREATORBUG-20108
Change-Id: I7382a1fa8b8b5869e6be11367e27d6a786f6aa74
Reviewed-by: hjk <hjk@qt.io>
2018-03-23 15:09:09 +00:00
Ivan Donchevskii
99bd0ed2a4 Clang: Rebuild overview model tree when token data is updated
In release builds overview model tree is built earlier
then the job with token information is completed.

Change-Id: I1a563551e813996001fb97924ac441e2b7d599b9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-23 14:15:45 +00:00
hjk
d66e8b6ea0 Debugger: Remove some spurious '.report' content from dumper output
No real damage, the parser on the Creator side is apparently robust
enough. Still no need to add this.

Change-Id: I8329a55c44f866070fb3df48c3a22000ee33e848
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-03-23 13:03:35 +00:00
Tobias Hunger
cebc354484 CMake: Remove icon from QRC file
Change-Id: Idf0187858b7617d52f8d91b2b2d6febe1ea93bca
Reviewed-by: hjk <hjk@qt.io>
2018-03-23 11:00:41 +00:00
Tobias Hunger
38ed8495dd CMake: Move CMake project settings page into Build & Run
Change-Id: I51d482aa0187e4fc501d6c82f506c9874ffc6551
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-23 10:40:28 +00:00
Tobias Hunger
63f31a1e4b CMake: Make cmake build step available to all build step lists
"cmake --build ." is useful to build, clean and deploy, so offer it
everywhere.

This fixes soft asserts as a side effect when loading cmake projects with
existing "cmake --build . --target=clean" in their clean steps.

Change-Id: I39e5866f6012b9ea1153da324e4abd1cd25fea92
Reviewed-by: hjk <hjk@qt.io>
2018-03-23 10:40:18 +00:00
Tobias Hunger
9f21358cbe CMake: Remove code that is obsolete since QtC 3.7
Saved data has changed in QtCreator 3.7, remove compatibility code.

Change-Id: I27e1f163f905b5f8fd105f3cdeaf047777a1c06c
Reviewed-by: hjk <hjk@qt.io>
2018-03-23 10:40:12 +00:00
hjk
8e90ce7e01 PythonEditor: Simplify PythonRunConfigurationWidget
Use new wrapWidget() convenience function and don't use
members for locally used items.

Change-Id: Ia063501a124a56d0ade82dbc17d1087b11d4a88e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-23 08:34:30 +00:00
David Schulz
07870754b6 fix qbs build
broken by 190c5083b7

Change-Id: I28b509c91e3cc4e80c4dde1748bc92415929a46d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-03-22 14:09:54 +00:00
Marco Bubke
ceaaebdb36 Increment year in copyright template
Change-Id: I2f6a87a6c69ddb5425be2c7a82af23682769021b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-22 13:42:41 +00:00
Marco Bubke
53454b0f79 Clang: Use PCHs for indexing
As generating the AST is quite expensive it would be very useful to cache
the not changed include. So we generate PCHs for include outside of a
project part. With this change this PCHs are used by the indexer.

For that they are save to the symbol database by the PCH manager and when
fetched by the symbol indexer.

Change-Id: I7a5b07cfb32d72d50dc52d2b108cd41727a7bfc7
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-03-22 13:26:24 +00:00
hjk
401d6862b5 Debugger: Make CharArrays dumper test pass on linux
I need the #include <wchar.h> after a recent upgrade.

Change-Id: I59790d6c92b14f42df8b5ece7227c406f2810c8b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-03-22 13:05:38 +00:00
Ivan Donchevskii
70f5e0e264 ProjectExplorer: Add kit environment flag to force MSVC English output
Enabled only on Windows.

Task-number: QTCREATORBUG-316
Change-Id: I69fb92f2eafa089b51e91390bc3099982465c246
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-22 12:29:15 +00:00
hjk
08ba8933c6 OutputPaneManager: Use a structure for related pieces
One vector with things handled together can be better
that keeping four vectors in sync.

Change-Id: I47865a5a2147a3795a3c820aa2676fb9611cab25
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-22 11:38:58 +00:00
Eike Ziller
c23d2b6e09 Increase requirement for building Qt Creator from Qt 5.6.2 to Qt 5.9
Qt 5.11 will be released and Qt 5.9 is the new LTS.
Increasing the requirement allows us to remove some baggage and
workarounds like Utils::asConst, special Q_OVERRIDE header, and
deployment target adaptions on macOS, and simplifies pulling in
proparser changes from Qt.

Change-Id: I9faf99336d26dd20bd63e6904ae543c0f351aa4d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-22 10:01:36 +00:00
hjk
798d115a5c Consolidate some run configuration widget boilerplate
This removes the outermost layer of widget-vbox and moves some
common code into a helper function.

The pattern repeats (with variations) a few more times, that's
left for later patches.

Change-Id: I8c98229cf41d03d5330c896ec9fa0965bfc65602
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-22 09:44:49 +00:00