Commit Graph

52923 Commits

Author SHA1 Message Date
hjk
706fb1a2b6 Debugger: Make setFixupNeeded() accessible to user code
Change-Id: I470b91e5ad80f2086f49c48d00975dd66444aa30
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-05 13:41:29 +00:00
Eike Ziller
ca3b882ab8 TextEditor: Fix painting with frame turned on
When using our text editor in a normal panel, we want to turn on the
frame again. Make sure that the extra text editor area does not overlap
the frame, and also make sure that there is no extra area shown at all
if all its features are turned off.

This fixes the painting of the input fields in the Clang Query advanced
search.

Task-number: QTCREATORBUG-18815
Change-Id: Ie74f87ddc576c02cd5ea7650f2632fe91df143eb
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-05 12:04:17 +00:00
Nikita Baryshnikov
903308e908 ProjectExplorer: check file renaming result
Change-Id: I6872bc09f173e2af7a1ebc416d3d5ebcf9dea46a
Reviewed-by: hjk <hjk@qt.io>
2017-09-05 11:42:04 +00:00
Eike Ziller
05485071b0 Handle case sensitive file system gracefully with case-insensitive setup
If you use a case sensitive file system with a Qt Creator that is set to
case insensitive file system handling (default on Windows and macOS),
we still want file change notifications to work as long as you do not
actually have files that only differ in case.

This requires us to carefully differentiate between the keys that are
used for comparing files (=> case insensitive), and the paths that are
registered in the file watcher (=> file path as we get it from the
user).

Also for the check if a file path is a symlink, we should not check
equality of the resolved vs unresolved keys, but equality of the
cleaned, absolute paths (resolved vs unresolved).

Task-number: QTCREATORBUG-17929
Task-number: QTCREATORBUG-18672
Task-number: QTCREATORBUG-18678
Change-Id: I36b8b034880a0c60765a934b3c9e83316c4eb367
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-05 10:53:08 +00:00
Alessandro Portale
d010dbd190 Welcome: Remove the big minimal height requirement
The SideBar in the QtWidgets based Welcome mode had a high minimal
height which cause whole Qt Creator not to fit on my HD(720) screen.

This change wraps the SideBar into a vertical scroll area.

Change-Id: I1d70ced1bbe803fb866159dd557a401c3ab6a9b2
Reviewed-by: hjk <hjk@qt.io>
2017-09-05 10:21:29 +00:00
Tobias Hunger
4ef01c961e app_version.h: Make IDE name configurable
Change-Id: I993f452c8d09cf89e9a2958fc8e36b7d2c17ee6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-05 10:19:48 +00:00
Eike Ziller
ca959d8063 Merge remote-tracking branch 'origin/4.4'
Change-Id: Ic9a1cf3b40b259d9c77f2f542405d189171e0fbf
2017-09-05 12:15:42 +02:00
Ivan Donchevskii
410e31c665 CppTools: set default -std=c++11 for Qt4
qmake from Qt4 does not provide C++ standard and
clang can't properly compile Qt4.8.6 and earlier
with c++1z. Behavior in this commit mimics qmake
from Qt5 which also provides c++11 as a default
standard.

Task-number: QTCREATORBUG-16441
Change-Id: I3d29891d6e47f2367f2b3b2bf4be4d86661924e9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-05 09:37:14 +00:00
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
Leena Miettinen
33bb20ba57 Doc: Make Android SDK Tools requirements clearer
The Android SDK Tools packages have changed, so the tool for
installing the required tools depends on the installed Tools
version.

Change-Id: Idcbda80c958a4f0d2d5be533481e9838fd95e71a
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-09-04 12:59:51 +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
Leena Miettinen
4adfae9d96 Doc: Fix putArrayData() debugging helper documentation
Task-number: QTCREATORBUG-18836
Change-Id: Iae037b4a45060b22ee36c94d19eeea940ebf1b95
Reviewed-by: hjk <hjk@qt.io>
2017-09-04 11:55:25 +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
Nikolai Kosjar
54a43de656 Add experimental .clang-format
This adds a configuration file for clang-format [1] and a test file to
demonstrate benefits and current problems with respect to Qt Creator's
coding rules [2].

This is based on clang-format from the llvm/clang 5.0 branch, which is
about to be released soon in the next days/weeks (already behind
schedule).

Using clang-format for Qt Creator brings these advantages:
 * Enforce a bunch of coding rules by a simple tool/shortcut invocation.
 * Spend less review cycles for authors and reviewers regarding
   formatting. This helps especially for/with first-time contributors.
 * clang-format sorts includes and using declarations.
 * clang-format adds/updates namespace end comments, e.g.: } //
   namespace Foo

See dist/clangformat/README.md for setup instructions und currently
known issues.

[1] https://clang.llvm.org/docs/ClangFormat.html
[2] https://doc-snapshots.qt.io/qtcreator-extending/coding-style.html

Task-number: QTCREATORBUG-17643
Change-Id: I87bdd66b8e492e99a360022962b0053f02a33e57
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-04 06:53:55 +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>
v4.4.0
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
Leena Miettinen
0bc2c807bd Doc: Update docs for the iOS code signing
Task-number: QTCREATORBUG-18785
Change-Id: Id3cb73236fc27ce8b23db55b1583474f68596619
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-09-01 07:11:32 +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
Robert Loehning
5f7636254a Squish: Store text of item as early as possible
It seems that item.text can change after (not during!) the
double-click. Storing it earlier to workaround this problem.

Change-Id: I5da4ae7ea8e19b945e56349c2236940a9e5731cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-01 05:04:19 +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
07f9f8da9d UnitTests: Fix wrong file name in pro file
Change-Id: Ibef9b5010815409e4a82453175c63c48dd3a2f15
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-08-30 19:59:32 +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
hjk
e404ba9de1 PortGatherer: Add test for Mac's netstat output.
Change-Id: I6df357502e5621e858a848c567fe1590762d5fc1
Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-08-30 12:56:11 +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
Robert Loehning
ba1036fd46 Squish: Fix searching for filename in windowTitle
Currently, only the end of a filename as actually
compared since the title also contains "filename.h"
when the title starts with "otherfilename.h"

Change-Id: I60dd4dc1fd7c53fee2ddbc44953bcfe4d75c7530
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-08-30 12:27:37 +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