Commit Graph

55006 Commits

Author SHA1 Message Date
Marco Bubke
b0fd6c30ce Clang: Distinguish between Enum and Records
Creator is distinguishing enumerations and records, so we should do too.

Change-Id: I114cfd207464abd9afd96c26c7504cf8a3a1cb8c
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-12 13:11:51 +00:00
hjk
bc698d4ce6 ProjectExplorer: Consolidate RunConfiguration identifications
The previously per-Project/RunConfiguration changing meanings of
BuildTargetInfo::buildTarget have by now been split
into separate values in BuildTargetInfo:
  - buildKey     a handle to one item in Target::applicationTargetList
  - displayName  a user-visible string in the run settings page

The buildKey was tweaked to coincide with the previous 'extraId',
i.e. the non-RunConfiguration-type part of the project configuration
id that (still) use id mangling.

This allows replacing the cases of locally stored seven different
versions of buildKey(-ish) data by one RunConfiguration::m_buildKey,
and do all remaining extraId handling in RC::{from,to}Map only,
i.e. remove the base ProjectConfiguration::extraId() virtual and
remove the "re-try fromMap with mangled id" hack entirely.

The id mangling is still used to temporarily maintain .user file
compatibility in some cases for now, but should be replaced by
storing the build key and the RunConfiguration type soon. Qbs
already changes in here to only use the uniqueProductName as
buildKey, without the previously added display name which is
stored as part of the ProjectConfiguration already.

It turns out that RunConfiguration::buildSystemTarget was intended
and used to retrieve an item from the Target::applicationTargetList
for some configurations, coinciding with what buildKey does always.
So use that insteand and drop RunConfiguration::buildSystemTarget.

There is clearly is further consolidation potential left.

handling of (default)displayNames is still a per-runconfiguration
mess and there is further consolidation potential left.

Change-Id: I448ed30f1b562fb91b970e328a42fa5f6fb2e43e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-12 12:11:45 +00:00
Christian Kandeler
4ab7c19e84 Let users set a global default for whether to amend the run environment
... with the paths of libraries used at link time. The value can still
be set per run config.

Task-number: QTCREATORBUG-20240
Change-Id: Ibe2425e95d791f93af2fba85a64be8bde6b31f5a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-04-12 11:08:37 +00:00
Marco Benelli
d7f431482d qmljs: handle js directives .pragma and .import
The directives .pragma and .import are not included in the AST.
Their source code locations are not stored in any other place.
As a result, when reformatting the source, they simply disappear.

This patch keep track of their source code locations, so they are
not removed when reformatting the source code.
This patch contains also some modification in the lexer that should
probably be ported to the qtdeclarative version.

Task-number: QTCREATORBUG-13038
Change-Id: I5d568abf02d37a584d4d246939736aaec5af5053
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-12 10:49:46 +00:00
Christian Stenger
c637c66ebb QmlProfiler: Avoid structs with default values
gcc 4.9 and msvc 2015 choke when creating those from initializer lists.

Change-Id: I85936fe33418d5d9ffeb3c910392ad43fbb9a9bb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-12 10:30:13 +00:00
Ulf Hermann
1155601da5 QmlProfiler: Move some methods from statistics view into model
This allows us to tighten up the public interface of the model.

Change-Id: Iaa0363993de7cd94c3468d2c939198e65746e829
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-12 10:15:44 +00:00
hjk
085dfac560 QmakeAndroid: Remove an explicit reference to QmakeProject
The base Project is good enough nowadays.

Change-Id: I428fecb56c5d5cb59e7f8a98b570e83136c155d8
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-04-12 09:21:40 +00:00
hjk
7ae87fa8fd Use WorkingDirectoryAspect in CustomExecutableRunConfiguration
Change-Id: Id7e082aed3161e7a85a4d23b74cc9b1c848e5631
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-12 09:16:21 +00:00
Robert Loehning
417436c965 DocumentModel: Replace optional::value by non-throwing alternative
...to not throw exceptions into dtors

Change-Id: Iee6cb7567befcc07879db496adeb3a2afedd18f3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-12 09:16:08 +00:00
Ivan Donchevskii
bb83f8fdb2 Clang: Set proper translation unit option for UpdateExtraDocumentAnnotations job
Change-Id: I929070698d91d184ca9e0f7cc398be0e74710ce5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-04-12 09:15:25 +00:00
Ivan Donchevskii
f9d95c9205 Clang: Optimize clang overview model
Build the tree in only one loop.

clangbackend generates tokens almost as fast as it
did before (about 10% slower in general).
Broken documents are more affected and take much more
time (about 300%) but it's better to have this time spent
on backend side then in QtC itself.

Task-number: QTCREATORBUG-20205
Change-Id: I34c58bca30c4494005a029abd82c7e612ecd6fb9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-04-12 09:15:12 +00:00
Ulf Hermann
5de5794c49 QmlProfiler: Disambiguate parent/child terminology in statistics
When talking about call stacks call them "caller" and "callee". Call
the invisible root item of the model "rootItem".

Change-Id: I551b23f1491d391145193901d3f3a29ab3942089
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-12 09:13:22 +00:00
hjk
abfe7fd3c7 BareMetal: Do not use QtOutputFormatter
Qt is unlikely to run there, so that's never triggered.

This also removes the only dependency of the plugin on QtSupport.

Change-Id: Ic22dcca9836e72a0bce46e67d354c4fcff1ac069
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-12 09:13:02 +00:00
Ulf Hermann
f94e048c2f QmlProfiler: Un-pimpl statistics classes
They aren't part of any public API and the pimpl pattern just gets in
the way here.

Also, initialize members inline where possible, remove redundant
deletes, prefer explicit ownership over parenting, and use
std::unique_ptr for owned objects and QPointer for non-owned QObjects.

Change-Id: Ibe1e1f88d0e38b6ca26544fccb1db6b809d1556b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-12 09:12:10 +00:00
Christian Stenger
86b78bde5d AutoTest: Allow framework specific tool tip on settings
The grouping checkbox enables grouping, but frameworks can have
more grouping modes than the default implementation.
Allow frameworks to provide its own tool tip for the checkbox
on the general settings page.

Change-Id: I0515e542284491a669ef33820104a32074ecf885
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-12 08:27:25 +00:00
Christian Stenger
aee959ea1d AutoTest: Add gtest filter mode
This adds another grouping mode to the gtest framework based on
gtest filtering. You can now specify a filter that will be used
to group the gtest tree items into matching and non-matching
tests.

Change-Id: Iaf0e55c9e57e2720f4fa84ab4b51ecaeb614df88
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-12 08:27:11 +00:00
Orgad Shaneh
070b5fdbbb Clang: Fix minor style issues
Change-Id: I040e3f6fcd717b4ffae2f0ded8bfebada67888fb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-04-12 07:21:29 +00:00
hjk
fb8f007bbb Android: Move some unshared code closer to its only place of use
Change-Id: Ieaba2c8f76ee9ac020ebd44712aee593c34e4bf0
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-04-12 07:03:06 +00:00
Ivan Donchevskii
84b983617f Clang: Support anonymous types in tokens
Add extra data to Keyword tokens.
Does not affect highlighting.

Change-Id: I206499ea35ee4ece5fe442665c904090cf5d90fc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-04-12 06:51:07 +00:00
hjk
3290de7a4e FakeVim: Remove Utils dependencies from fakevimhandler.cpp
There have been requests to easily re-use FakeVim in other projects.
To make that easy, cut the few explicit ties to libUtils in
fakevimhandler.cpp.

Change-Id: I090d50fb1fd4e62d97e9430e94a84d1f267773a4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-12 06:50:31 +00:00
hjk
b3d16f4465 Nim: Use aspects in NimRunConfiguration similarly to other runconfigs
Change-Id: I4b9d9cda4867c36cece3f4d4e208ec4163a7d6b8
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
2018-04-12 06:31:55 +00:00
hjk
870a5c581a Debugger: Make libcxx's std::vector plottable
Task-number: QTCREATORBUG-20249
Change-Id: Idc17fcbda34273b4f29f0da0b01eddcd4f83c52d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-12 06:28:48 +00:00
Ulf Hermann
06aa4c573e QmlProfiler: Fix type for restrictToFeatures
Change-Id: Ifdc75c570faf4ae6784decf80a530c0e30d44e1d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-12 05:53:30 +00:00
Ulf Hermann
1732b6f882 QmlProfiler: Drop some dead code
Change-Id: I43e0803461ff8d6e30fde3c526d62402fedb6f4b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-12 05:51:42 +00:00
Ulf Hermann
5aaaa7c198 QmlProfiler: Get rid of field/column mapping in statistics view
None of the fields are ever unavailable, and they are always shown in
the same order, so we can just use the enums directly instead of a
mapping and an extra whitelist. This enables us to also drop some magic
numbers. In addition, none of the items have children. So we don't need
to expand or collapse them.

Change-Id: Ibf3d1933d1fb703f5d8e74ae5043c3d1db462738
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-12 05:51:34 +00:00
Thomas Hartmann
4f4e5102ea QmlDesigner: Slightly increase section size
Change-Id: Iaa42a5e7fa1b58bf77f05ea04fcb997b647f474a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-11 15:46:44 +00:00
Antonio Di Monaco
bf5ba08435 Fix coding style
This patch fixes the incorrect brace symmetry contained in the patch
916bc59cfb .

Change-Id: I003c89f5f2170190d1ae2f52f186862fe06a2135
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-04-11 14:47:18 +00:00
Tobias Hunger
94cb7c988b QmakeProject: Do not try to emit "parsingStarted" several times
This prevents a soft assert from triggering.

Change-Id: Ic2b650f1c850d87492bad8f23d200ede0de35722
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-11 13:23:47 +00:00
Ulf Hermann
939db5feab Timeline: Use plain array as model for RangeDetails
The type restrictions enforced by ListModel effectively force us to
convert everything to QString before we print it. This is probably not
more efficient than using dynamic types, and it force us to write a lot
of boiler plate code.

Change-Id: I3f61409782a676858874380d3b617ab46b4144ff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-11 12:27:07 +00:00
Orgad Shaneh
3a52a2c3f1 QmlJS: Sync parser with Qt 5.10
Change-Id: I87c64edc1235bab10b9f32abeab4386b5cc7390b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-11 12:15:19 +00:00
Tobias Hunger
dba102ff61 SettingsDialog: Set a more reasonable default size
Set the minimum size on first start to something reasonable. Currently
the SettingsDialog starts out tiny on Linux and is unusable till
resized for the first time with empty settings.

Change-Id: I1e0f6dc0bc5a41ba53f655f81181fbba84da23df
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-11 11:43:05 +00:00
Thomas Hartmann
a7bf5fae72 QmlDesigner: Stretch factor has to be set after inserting widgets
Change-Id: I90c48c6ca5d7eee51b0d0192ab045ff11a8a7c97
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-11 10:59:23 +00:00
Thomas Hartmann
34f8bbe502 QmlDesigner: Open states editor as expanded
Change-Id: I690aa94f3990f9dd5ab18ab327e37b9a1e42be08
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-11 10:59:18 +00:00
Thomas Hartmann
ba1dcb5506 QmlDesigner: Remove magic number
Change-Id: Id493ef001293afd9271dc5b8142d190f1f434633
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-11 10:58:48 +00:00
Orgad Shaneh
7caa09c71c UnitTest: Fix signedness incompat. warning
Detected by GCC8.

Change-Id: Id45f8d7928d2071ce7ad59ce0c09e9baa9cbf32c
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-11 10:43:31 +00:00
Alessandro Portale
95eadc99f4 utils: Icon: remove dead pixmap-combination code
Utils::Icon can theoretically take lists of "plain" pixmaps and compose
them into one icon/pixmap. But neither is that feature used once in Qt
Creator nor does the Icon API really imply that possibility. Therefore,
the functionality can be removed.

As an additional gain, this change lets QIcon/QPixmap handle the loading
of single pixmaps directly with the benefit that QIcon handles different
@?x versions "the Qt way" (returning QIcons with multiple resolutions,
if available).

Change-Id: Id1ef5115c973a99bebd3d433bf88b3ab24be2bbd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-11 08:25:29 +00:00
Christian Stenger
2945865516 AutoTest: Provide possibility to copy tree items
This allows to create a copy of an item. Basically it will
copy its member objects, but it does not copy its children.
Preparation for extending grouping support for GTest.

Change-Id: I75f92be53ff4191cacea2944b31641a9292d1e58
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-11 08:24:47 +00:00
Ivan Donchevskii
d6bb6c5018 Clang: Link clang driver with clang-tidy/clazy libraries
There's no easy way to build clang-tidy .dll
and load it dynamically. The same for clazy.

Required for the tools based on clang executable
which want extra diagnostics from clang plugins.

Change-Id: I425d10c1a87e3051a44b9ffd13eb2968110101af
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-04-11 07:26:27 +00:00
Nikolai Kosjar
54e82eca80 Clang: Update info bar hint
We use CXTranslationUnit_KeepGoing, so errors in headers will not lead
to the expensive regeneration of the preamble on each reparse. Adapt the
info bar hint.

Change-Id: I340a1f862473f1b3aec0718bb5a2940fff0a91ed
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-11 07:18:41 +00:00
Nikolai Kosjar
e5610c6ae2 Clang: Clean up qobjectdefs.h
* Remove unneeded #include that might lead to false diagnostics
* Fix typo

Change-Id: I38a3bbe07dbcb33f004c7b7a2a4ca4a90fb77350
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-11 07:18:21 +00:00
Eike Ziller
d44ed66a9f File System View: Add option to show folders on top
Task-number: QTCREATORBUG-7818
Change-Id: I37a36a03c9baf6fba7b3eedcb52ee5912a57a47a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-11 06:51:48 +00:00
hjk
99bcc00199 ExtensionSystem: Remove PluginManager::getObjectByClassName
Not used anymore inside Qt Creator.

If 3rd party code really relies on this function, it can use the
function locally, or, likely switch to the still supported
getObjectByName or getObject.

Change-Id: I041877b3e0630e6b257055dec5e10baf68c83546
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-11 06:47:18 +00:00
Eike Ziller
6f91ce1c52 File System view: Add "New Folder" to context menu
Task-number: QTCREATORBUG-17358
Change-Id: I64b3d34ca0432369630382c40cf749f3cc1a08df
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-11 06:43:26 +00:00
Eike Ziller
ab7960f6cf Move Project::makeUnique to Utils
This is more generic than projects

Change-Id: Ifdbc57ff48f9fd4a40e6149ba636e0a55cbac502
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-11 06:42:27 +00:00
Thomas Hartmann
7160b83589 Allow to disable or enable high DPI scaling
An option is added to the Options dialog:

* Allow to enable high DPI scaling on Linux
* Allow to disable high DPI scaling on Windows

On macOS+retina, high DPI scaling applied automatically
and we do not show the option on macOS.

I had to duplicate the logic for parsing -settingspath,
because the code has to run before QApplication is created.

Task-number: QTCREATORBUG-20232
Change-Id: I4e94fc54391fe99e30d4778ec2a178529961eed7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-04-10 16:28:35 +00:00
Tobias Hunger
12d25f8061 Nim: Set targetAbi to Abi::hostAbi
Considering that you can link C libraries into the binary the
hostAbi is a better default than unknown-unknown-unknown-unknown.

Change-Id: I24ced24a2d04cdeb794d32c85a42bb848c7291ed
Reviewed-by: hjk <hjk@qt.io>
2018-04-10 15:12:29 +00:00
Antonio Di Monaco
916bc59cfb Add support for system include directories in qmake project files
When system include paths are added via QMAKE_CXXFLAGS in a .pro file,
in order to use the -isystem parameter, they are not taken into account
by Qt Creator.

This patch adds support for -isystem parameter in QMAKE_CXXFLAGS
parsing.

Change-Id: Ibd25734ec9f3a18258c445804c4a17269d7522ed
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-10 14:57:20 +00:00
Tobias Hunger
2d84e003ea QmlDesigner: Fix build on Linux
Change-Id: I342a8004f117292cd955530729ae29571094d5cf
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-10 14:10:29 +00:00
Thomas Hartmann
45dfa5658b QmlDesigner: Increase size of states editor
Change-Id: I5541214ca8aa518a59d0fa6563e59f69f8048eda
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 13:19:32 +00:00
Thomas Hartmann
36e80ef142 QmlDesigner: Fix old naming convention in css
Change-Id: I0d73064d18f688d02aa15d13c733b98ee08b74a5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-10 13:19:24 +00:00