Commit Graph

57165 Commits

Author SHA1 Message Date
hjk
d21a43d9a8 ProjectExplorer: Introduce runconfig aspects for some bool values
And use it to handle adding extra library path for qbs and qmake and
and the DYLD debug suffix for qmake.

Could possibly be used more uniformly at some stage e.g. for CMake.

Change-Id: I0c4581b4e36960fc76d056c65c487d7c43a1be08
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-13 13:02:59 +00:00
Ivan Donchevskii
c3275c935c Clang: Fix paths in clang patch and its number
Change-Id: I27ab7d3c88cf057ad9505f817e2f211d734e23d4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-04-13 12:49:45 +00:00
Ivan Donchevskii
e9c462391e ClangTools: Split generic part from static analyzer tool
To reuse it for other clang-based tools.

Change-Id: I6c0d8e9eee543fa08faf3bf93c9fac33e43c6820
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-04-13 12:34:53 +00:00
Ivan Donchevskii
8936e51033 ClangTools: Always use CompilerOptionsBuilder for clang tools
We do not ship clang-cl anymore which makes it impossible
to run clang with MSVC options.
Secondly we used to we tweak compiler options quite a bit so
why not to switch to CompilerOptionsBuilder totally?

Change-Id: Id323cb554587afaea7d9aa530e947a45a03922d1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-04-13 12:34:35 +00:00
Thomas Hartmann
1bd967badb Avoid parsing the commandline arguments twice
We parse the arguments independently from QApplication
and initialize the settings before we create QApplication.

Therefore we can parse any setting before creating
QApplication which is required for high DPI support.

We use the QApplication argument parsing to filter out Qt
specific commandline arguments like style.

Change-Id: I83ead87476d99351de6fe4f86c96c39a721af47b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-13 12:18:13 +00:00
Christian Stenger
d9dfddac73 AutoTest: Simplify determination of RunConfiguration
Since bc698d4ce6 the build system targets / build keys are
unique on their own.
Simplify the completion of test configurations and improve
readability.

Change-Id: I258e8a35a4740dd58b1365498ca399258092e0e3
Reviewed-by: hjk <hjk@qt.io>
2018-04-13 12:04:45 +00:00
hjk
83c6a4916c ProjectExplorer: Streamline OutputFormatter creation a bit
Note that the concept of a single monolithic OutputFormatter per
RunConfiguration (and why RunConfiguration, not RunControl to start
with?) is unchanged and suboptimal as one cannot easily combine
existing use cases, e.g. Python_and_Qt.

Change-Id: Ibeb8191020387324f22ed313230293597f96e36a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-13 11:55:31 +00:00
Robert Loehning
6a62717271 Squish: Update tst_designer_goto_slot for Qt>=5.10
Change-Id: I29b3788f2daed5ca27069cc8ab9d972bdcee3c02
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-13 11:44:42 +00:00
Eike Ziller
845541c89d Fix compiler warning
Some compilers are picky with types used in ternary operators

Fixup of d44ed66a9f

Change-Id: I73b64592b7741269c6d3631fd0b14cd99c4a3c2a
Reviewed-by: hjk <hjk@qt.io>
2018-04-13 10:56:05 +00:00
Tobias Hunger
3d0459c428 AbiWidget: Improve AbiWidget
Do less work in the Abi widget by ignoring intermediate states. Blocking signals
did not work well enough:-)

This makes the Abi widget more robust since a lot of useless state changes are
avoided. It also reduces the number of abiChanged signal emissions from this
widget, avoiding potentially costly updates in its users.

Change-Id: I777097a165502fade22f9ca3f154314c7362d655
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-13 10:13:08 +00:00
Eike Ziller
193861072d Merge "Merge remote-tracking branch 'origin/4.6'" 2018-04-13 10:13:01 +00:00
Christian Kandeler
33d48093a8 Update qbs submodule
To HEAD of 1.11 branch.

Change-Id: I8f82841f13a45e127864d7a5786f0e48d65a4a56
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-04-13 08:56:15 +00:00
Orgad Shaneh
b41431545f ProjectExplorer: Close write channel for non-terminal processes
There is no way to enter input for those. Don't let them wait in vain.

Change-Id: I3ba023c086d575cbf6be1ad52560767b86b514f4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-13 08:55:33 +00:00
Eike Ziller
428fcb476b Merge remote-tracking branch 'origin/4.6'
Conflicts:
	src/libs/utils/settingsaccessor.cpp
	src/plugins/autotest/autotestplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.h

Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
2018-04-13 10:54:42 +02:00
Christian Stenger
9e29a32e1a Utils: Fix compile with gcc4.9
Otherwise compile fails with
 constexpr constructor does not have empty body.
Broke with 4b0bcbdcb6.

Change-Id: I5f058cd4ef11dddb72c8fc88b7184d41f4ffc15a
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-13 05:47:46 +00:00
David Schulz
f4594c922f Highlighter: fix crash after closing file
Regular expression rules are tracked inside the progress data to inform
the rule about a finished highlighting process. A cloned rule was not properly
tracked. That results in a rule that tries to untrack itself on
destruction after the progress data has already been deleted.

Task-number: QTCREATORBUG-20247
Change-Id: I007e7afbc16706bc28f89faf91c0b1c5f0bc692a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-13 05:10:16 +00:00
Nikita Baryshnikov
c18747c853 clang_installation.pri: Don't add default include paths to LLVM_INCLUDEPATH
Full error:

In file included from /usr/include/c++/7.3.1/bits/stl_algo.h:59:0,
                 from /usr/include/c++/7.3.1/algorithm:62,
                 from /home/nib/Qt/Latest/include/QtCore/qglobal.h:142,
                 from /home/nib/Qt/Latest/include/QtCore/QtGlobal:1,
                 from /home/nib/soft/qt-creator/src/libs/sqlite/
sqliteglobal.h:30,
                 from /home/nib/soft/qt-creator/src/libs/sqlite/
utf8string.h:28,
                 from /home/nib/soft/qt-creator/src/tools/clangbackend/
source/clangcodecompleteresults.h:30,
                 from /home/nib/soft/qt-creator/src/tools/clangbackend/
source/clangcodecompleteresults.cpp:26:
/usr/include/c++/7.3.1/cstdlib:75:15: fatal error: stdlib.h: No such
file
or directory
 #include_next <stdlib.h>
               ^~~~~~~~~~

Change-Id: I590f95b201dc5e3e0ad44f8d2e580b380f31bd7c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-04-12 19:01:00 +00:00
Marco Bubke
438b5736d5 UnitTests: fix spelling
Change-Id: Ib6a94c0fac5fe6ead62a440dbe8c6368cfd7dd57
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-04-12 14:38:51 +00:00
Ulf Hermann
d9fb7b2cf1 Timeline: Don't set detail width to 0 if content is undefined
This doesn't do anything useful but messes up the layout.

Change-Id: I4d59f828bced62c873a6eb96f7e0e2a023b8233e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-12 14:19:09 +00:00
Tobias Hunger
a7e2c4595a SettingsDialog: Use RAII for event loops
With a custom deleter the event loop is exiting. The erase function is
defining the order of deletion.

Change-Id: I50cb166c4e117cbb779db2d1b992221cd1d8ad60
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-12 13:59:25 +00:00
Alessandro Portale
8797123128 ProjectExplorer: Fix warning about signed/unsigned mismatch
Msvc says:
warning: C4018: '>=': signed/unsigned mismatch

Change-Id: Ib3fc4734088bd799271105ed3757d55562efcba3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-12 13:36:49 +00:00
Nikolai Kosjar
5f1d035a1b Clang: Backport support for parsing Float128 in stdlib.h
...if GNU_SOURCE is defined.

Task-number: QTCREATORBUG-20258
Change-Id: I0dbe8a2182c1e63fd2dd1bf955640da73da5653d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-12 13:36:26 +00:00
Ivan Donchevskii
851726aad3 ClangRefactoring: Do not save macros with invalid fileId
Change-Id: I2933fc3695ebf03b3e4f05a0435ca4d629877d2c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-04-12 13:14:38 +00:00
Marco Bubke
4b0bcbdcb6 Clang: Locator filter for the symbol database
There are no symbol queries for the locator filters. The signature
generation is still not implemented but for simple cases it should work.

Change-Id: Ic6b04fbe1e7e057892f194ac139615c47d6ec33f
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-12 13:12:24 +00:00
Marco Bubke
18de1e3fcf Clang: Disable PCHs generation
Some important features are missing so it should be disabled.

Change-Id: I24f8f2cd42c6c4d7152a36db0fe8496e4fb824a6
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-12 13:12:14 +00:00
Marco Bubke
ee85cf4518 Clang: Store the symbol kind in the database
It is cleaning up some other stuff too.

Change-Id: I75274356fd35f2ee8c84aedf8839c67506ab2355
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-04-12 13:12:08 +00:00
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
Alessandro Portale
b3d291d230 Qml tooling: Support Qt 5.11
QtQuick 2.11
QtQuick.Controls 2.4
QtQuick.Window 2.11

Change-Id: I78df0cf414e6c2ce72830b88d29a8777ac30c757
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-12 09:16:21 +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