Commit Graph

44349 Commits

Author SHA1 Message Date
Eike Ziller
58e8cf83ed GCC/Clang: Use sysroot from build system if kit doesn't set sysroot
If the kit has a sysroot set, we use that when determining the system
header paths of the tool chain for the code model.
But if the kit doesn't have a sysroot set, we should use the sysroot
setting that we find in the CXX flags that we get from the build system.

In the specific issue, we detect the Clang compiler from the Xcode
installation on macOS, which actually needs to be passed a sysroot to
return sensible system header paths.

Task-number: QTCREATORBUG-18633
Change-Id: Ida401bee8c4b82bb4fa2e6f952b8cc174ea081c6
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-09-05 08:39:52 +00:00
Marco Benelli
77f6a4321e SCXML editor: allow eventless transitions
According to SCXML specification (https://www.w3.org/TR/scxml/), the
'event' attribute is not mandatory in 'transition' tags.
Also, as specified in section 3.12.1, eventless transitions are handled
differently, and will be taken whenever the 'cond' attribute evaluates
to 'true'.

This patch removes the automatic assignment of 'event' property in the
tag constructors, but restore it when a new transition is done in the
editor.  In this way, the user can delete the unneeded events without
them being restored when reloading the document.

Task-number: QTCREATORBUG-18345
Change-Id: I96d6860ad3ed58ab49e83d3328e88ef984f40fa4
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-09-04 15:30:27 +00:00
Eike Ziller
3543bd5d1a Merge remote-tracking branch 'origin/4.4'
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I7881fc51021c49b792a384ad9f8a4f71fc457ce2
2017-09-04 16:12:34 +02:00
Christian Stenger
d9974ec6d5 AutoTest: Remove 'Settings' from options string
This string is displayed on the settings dialog - remove
the obvious.

Change-Id: I5352f9e0f3a2ca16965a5bf4d8513d639dd3e5d8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-09-04 13:45:54 +00:00
hjk
2aab5510ed TreeModel: Add a sibling() implementation
The base implementation uses the parent() index, which
in turn accesses the grand parent level. We can save
a few cycles here.

Change-Id: I3c3696118fe7c3d4563ee3cd28981fca62013828
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-04 12:36:26 +00:00
hjk
0a5abdae59 iOS: Adapt to new setter-based DebuggerRunTool interface
Change-Id: I96f113b831dcbd3735f743c8f12042e9b17903a4
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-09-04 11:59:04 +00:00
hjk
69f3ddb213 Android: Use new DebuggerRunTool interface
Change-Id: I4e0c8670802724984827b57e5d713548ad446654
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-09-04 11:57:42 +00:00
Ulf Hermann
ee9a730f4b QmlProfiler: Increase test timeouts further
Test runs frequently fail because the timeouts are too low. the test
library suggests around 12s, so we make it 20s to be safe.

Change-Id: I746b141949620310371de71b0b2ec7538dc4b5ce
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-04 11:33:20 +00:00
Joerg Bornemann
11297c238c Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: I379d20c9439e794888a4b269d0e9c55f3bc103a0
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-04 10:02:54 +00:00
Tobias Hunger
60b8712a42 Wizards: Do not crash when adding files to existing project
Do not crash when adding a file to an existing project that finishes
parsing while the wizard is still open.

Make sure the Node that is passed into the wizard is still valid after
parsing. Provide more information to the wizard so that this can be
checked -- and to find the similar node in the new project tree.

Also avoid a crash when adding existing files.

Do not crash when project parsing finishes while the wizard
summary page is open.

Do not crash when the project gets closed while the summary page
is open.

Do not have the ProjectTree send signals about subTreeChanges if
the node that changed is not part of the ProjectTree. This avoids
an infinite loop when updating the combobox on the summary page.

Add a treeChanged signal to ProjectTree.

Task-number: QTCREATORBUG-18651
Change-Id: Iaed3d0d1f079c09e54389821a11bda596139f35c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-01 14:42:34 +00:00
Christian Kandeler
1bcde48da9 Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: I5ce399f9cbe9ee05720f7135676dfcd3ac6f88fc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-09-01 13:29:21 +00:00
Alessandro Portale
40683aaa4e TextEditor: Prevent flashing window when switching to QML outline
The reason for the flashing is that the toolbuttons in the toolbar are
constructed without initial parent. The Filter toolbutton is set to
visible before it is parented, and therefore it creates a top-level
window. Milliseconds later it gets a parent and the window disappears.

Task-number: QTCREATORBUG-18823
Change-Id: Ide100d9117484131007a4d4d2e584d0967aa7377
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-01 10:21:16 +00:00
Leena Miettinen
fe9464fa04 Doc: Add Getting Started with Qt for Device Creation to Tutorials
Change-Id: Ie7c2ac11e8faf7a0ee7cde5a066395a8c63871a2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-09-01 08:09:53 +00:00
Christian Kandeler
28b0de8027 Update qbs submodule
To HEAD of 1.9 branch.

Change-Id: I4462e6e1c2089b602db01bcf073ed4d1ac5b29ca
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-09-01 07:02:07 +00:00
Claus Steuer
4e4118dd26 AutoTest: Add location info to all GTest results
Currently location information are only set for failed gtest results.
One can't jump to the location of a successful test by doing a double
click on the corresponding entry in the test result pane.

Use the TestTreeModel to obtain the location information for successful
tests in the GTestOutputReader.

Change-Id: I3fad2d0540edb653ff186011cb92db220748b4f5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-01 05:02:38 +00:00
Eike Ziller
285f054d74 Locator: Don't ask disabled filters for results
If they are disabled, behave is if they didn't exist (when looking for
matches). This was no issue with our own filters so far, because these
(by accident) also don't have anything to return if they are disabled.

Change-Id: Ia5fe85039631c41f7488d78d9f54b6322dc72b32
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-31 13:42:01 +00:00
Thomas Hartmann
be4cfb5f16 QmlDesigner: Adjust margings for "move zone"
I introduced a zone around the boarder of each item where
it can always be dragged,
instead of selection another overlapping item.
The area is now a lot smaller, but the 4px seem enough for me
when testing it.
This zone is slightly to big. I keep the size of 20px at the top
so the label/gizmo is always dragable.

Change-Id: Ia1b8afb822b506f5322b952d5537eafc73b52ea2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-31 13:36:16 +00:00
Tobias Hunger
5f9c7c8986 Resources: List .qrc files in project
List .qrc files (and the files contained) in the project.

Task-number: QTCREATORBUG-18790
Change-Id: If23ffd42900d67bcc8d8c9d2ecfb0e82daf8c986
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-31 13:09:59 +00:00
Marco Bubke
e8a6c7e9c5 Clang: Add placeholder text to Clang Query
Task-number: QTCREATORBUG-18815
Change-Id: Ie5d53f0b3f2464408bb09022483a3a6258e8173d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-31 11:36:26 +00:00
Christian Kandeler
436b0c86f5 sdktool: Fix qbs build on macOS
Change-Id: Ia84f814b653b1b07c20d02c724a1951914c1e0b5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-31 11:32:43 +00:00
Thomas Hartmann
feb05b9353 QmlDesigner: Allow WebEngine import
Change-Id: I26b6416bcfc00e9c04bbbb20ccb7d54f9fb298a5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-31 09:07:56 +00:00
Thomas Hartmann
c48b5f4ae0 QmlDesigner: Switch tooltips in the navigator
During refactoring the tooltips have been switched.

Task-number: QTCREATORBUG-18667
Change-Id: Iaacb333deebff46b0858ffff9dbd8f30954c7db8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-31 09:07:31 +00:00
Nikita Baryshnikov
7f68088f3b PluginView: remove stale includes
Change-Id: Ic3484d8694b54032c8ee3dbb9aa45b97e19c9b6c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-31 08:31:16 +00:00
hjk
c6106ff867 BareMetal: Use new setter based DebuggerRunTool interface
Change-Id: I96ea87f1219c781d3be6e7838575ae5d5cc0b195
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-31 06:58:56 +00:00
Marco Bubke
881cd5a799 Utils: Add more constexpr to SmallString
Change-Id: I480ef040a8d9c5b9edc515c7fd58db2fad42dc86
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-30 14:22:01 +00:00
Marco Bubke
2bc537ca6b Clang: Fix build again
Change-Id: I1c8164a32c3cbfa27ce72db5093bbda613e1b9d9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-30 12:58:15 +00:00
Eike Ziller
c531351d20 Merge "Merge remote-tracking branch 'origin/4.4'" 2017-08-30 12:50:38 +00:00
Eike Ziller
696a978942 Merge remote-tracking branch 'origin/4.4'
Change-Id: I5b12586086297b57e250bbbd9c94818623ad33f9
2017-08-30 14:49:19 +02:00
Tobias Hunger
1c7d1672fa CppEditor: Fix typo in comment
Change-Id: Ia6fca1df88ec5d2ed79de07b3633894a255c88d8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-08-30 12:42:56 +00:00
BogDan Vatra
2ebd51fca3 Android: Search for gradle template in QT_DIR/src/3rdparty/gradle
Qt 5.6.3 LTS adds gradle template but QtCreator failed to use it
because it compares Qt versions instead to search for gradle templates
in QT_DIR/src/3rdparty/gradle

Task-number: QTCREATORBUG-18811
Change-Id: I97c817f143a1d76fe4e2544b138cad9f4914eeee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-08-30 12:36:43 +00:00
Filipe Azevedo
69b75895fa Implement port gatherer on macOS
Change-Id: I054612716872cdb90f2a3fb5d31c20e19962ebaf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-08-30 12:24:50 +00:00
Marco Bubke
d551c39faf Clang: Fix build
Change-Id: I7a310402ec4527e4db47b46e34078885e08dac0b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-08-30 12:14:46 +00:00
Marco Bubke
3dd1d11f6e Clang: Fix path for clang query
Task-number: QTCREATORBUG-18814
Change-Id: I638fa4dd993e8efbabefc883622e1619b4e5d9cc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-30 11:01:18 +00:00
Marco Bubke
ecad2cc621 Clang: Fix formatting
Change-Id: I1fd3d1ebb3788e39d3c900df6af92c0cd94d667b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-30 08:56:30 +00:00
Christian Kandeler
d2caeda17f clangcodemodel: Fix qbs build
Change-Id: Ib44d02ff0f8feb816a86fc6050e24a6cf9edbc71
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-08-30 08:23:29 +00:00
Christian Kandeler
e9e3a7d5e3 sdktool: Fix qbs build
Change-Id: If024aed2ddf06236284881a51df6af4b96585dfa
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-30 08:05:34 +00:00
Orgad Shaneh
6467fe28ce ProjectExplorer: Parse another type of undefined reference error
obj/gtest-clang-printing.o:gtest-clang-printing.cpp:llvm::VerifyDisableABIBreakingChecks: error: undefined reference to 'llvm::DisableABIBreakingChecks'

Change-Id: Ifca2670c088962f6b60b6de522eb9e19e472bdb4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-08-30 08:00:42 +00:00
Tobias Hunger
a5e447b4f8 MessageManager: Allow more control when showing Pane
Change-Id: I7169473818cf726545a85cdc686655b0d4dbf3e7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-30 07:46:04 +00:00
Orgad Shaneh
139792ee25 Merge remote-tracking branch 'origin/4.4'
Change-Id: I9ab2c68d2bd07b0dd89051a2f5f6fa51676d8594
2017-08-30 01:24:11 +03:00
Marco Bubke
5ad44318eb Clang: Improve caching of file path ids
Clang is internally using an id to handle files. We add now a mapping from
their AST local id to out global id.

Change-Id: I2d724761287b5e915237175134ec5d3b92099ddb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-29 16:37:49 +00:00
Marco Bubke
efcfb5ee15 Clang: Improve file path caching
The old algorithm was comparing the string two times. One timer for smaller
and one for larger. And memcmp on a long string still costs. The new one
has a three state so it can compare smaller, greater and equal in one.
There is a reverse version too which has big advantage for file paths.

Change-Id: Ica4024f0a071803c697e2c1f26edd3eb1b203f9f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-29 16:37:43 +00:00
Marco Bubke
a307ee7444 Clang: Add SymbolQuery
Change-Id: I5cb81dffd6f1fda6bdcba0eedaf79f0bc91348b5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-29 16:37:37 +00:00
Marco Bubke
f49a1d721c Clang: Add symbol storage
Extend file path cache to 64 bit integer.

Change-Id: I5627f13d59a3214f389087038482cbcc8d0eb484
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-29 16:37:24 +00:00
Marco Bubke
81d43b8a11 Clang: Add symbol indexer
Change-Id: I8ff879631ae022bc870431628be002903360369c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-29 16:37:17 +00:00
Marco Bubke
f0e00a8c25 Clang: Add symbols collector
Change-Id: I64c25eef8eaa6cc6c3ff09d41866972b6c7248d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-29 16:37:09 +00:00
Marco Bubke
8640ef1927 Utils: Convert to SmallStringView for comparison
Change-Id: I38d9716225b81091e8e75b26c9c2258a2aefa987
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-29 16:36:57 +00:00
Marco Bubke
7c0331ab93 Clang: Rename library clangbackendipc to clangsupport
We already share same classes there which has nothing to do with IPC and
I want to more for sharing. So we should use a name which fits better.

Change-Id: Idfb12b6de714206117b92634ad719c6a0e290e78
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-08-29 16:36:35 +00:00
Tim Jenssen
a5625f2f9d QmlDesigner: initialize actions only at show
Change-Id: Iff6438daf70840116f02fcc439a6327c9401c32c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-08-29 16:35:16 +00:00
Vikas Pachdha
2e821a7730 Android: Fix default JDK path discovery
Task-number: QTCREATORBUG-18691
Change-Id: Ibd17e7edf1c2cfdcc54ff2b9f16a9125bb217a84
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-08-29 13:27:55 +00:00
Eike Ziller
354e5e75a3 AutoTest auto tests: Fix license header
Change-Id: Iee053367d5548af65c3f8e36e65377e7b8b0dd07
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-29 11:22:24 +00:00