Commit Graph

53197 Commits

Author SHA1 Message Date
hjk
015f0c03cf Qnx: Fix debugging
This apparently fell through the cracks in 89f02cba2.

Task-number: QTCREATORBUG-18804
Change-Id: Ib00a5a074ec1df3292267a194e8e87a92d3c6dfc
Reviewed-by: Dan Cape <dcape@qnx.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-07 07:01:52 +00:00
Eike Ziller
5680c1c874 Register Qbs documentation (if available)
Task-number: QTCREATORBUG-18441
Change-Id: I800fae056f7d1cfc60fab3b0c1964d3b9a2a99f7
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-07 06:46:36 +00:00
Christian Stenger
13a1f8686c Wizard: Fix Qt Quick Application wizards
They had been moved in sub directories and referencing of the
git.ignore file was not adjusted accordingly.

Task-number: QTCREATORBUG-18842
Change-Id: Id5f720015e94cb581d6b6337080de0c35c90e232
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-09-06 19:24:51 +00:00
Jake Petroules
6458473414 Android: remove support for local/debug deployment option
This is only usable with versions of Android older than 5. Now that
Android 8 is the current version, we say goodbye to this feature as it
is almost certainly no longer of use to anyone.

Task-number: QTBUG-62995
Change-Id: I19795eb385b18f4dd87a1bb8df57d36c3fa28dc5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-09-06 18:21:26 +00:00
hjk
8628150ffc Qnx: Give Slog2Info runner a display name
... for better debugging.

Change-Id: I24d2c6d10d659287ae61fdb4db735e658e3a68ce
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-06 14:25:24 +00:00
Robert Loehning
f98731b81a Squish: Update tst_create_proj_wizard
Change-Id: If6c85dab873fac694e3d0bea3ff65cbb08618f4d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-06 13:50:00 +00:00
hjk
898eb4a460 Debugger: Move .useTerminal modification to central fixup
Even if this is LLDB-specific having the value fixed early
will help in moving terminal handling into a RunWorker
of its own.

Change-Id: I73a9564148dec9b28557c12cc248a4f0b668f8d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-06 12:54:21 +00:00
BogDan Vatra
1f4e78d8a6 Android: Fix search path for QML modules
QT_INSTALL_IMPORTS was used by Qt 4.x, Qt 5.x uses QT_INSTALL_QML

Change-Id: I9c25ef005f3c5dc8cfc8d0b965426e22b542fb70
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-09-06 11:55:23 +00:00
Vikas Pachdha
27e740cab4 Android: Extend Android SDK sanity
Verify the essential tools and packages required for development

Task-number: QTCREATORBUG-18837
Change-Id: Ie89e8fcf3bf75f1db9cc5eac50859cf6f3e5fafd
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-09-06 11:41:37 +00:00
Christian Stenger
afc0192c8f QbsPM: Fix qbs build
This amends dce0b1c945.

Change-Id: I062d71d21e942fcdba87dd0425fd656f2b3d9641
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-06 11:20:35 +00:00
Nikolai Kosjar
1847034371 ClangStaticAnalyzer: Update comment about -dumpversion
Change-Id: I268e23dd6f73efcde0e6efcb04e3c0ffb946a11b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-09-06 10:39:39 +00:00
Eike Ziller
c2ef4b52d3 Merge remote-tracking branch 'origin/4.4'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I9620928b431cefa995a06db85ecfcb92f225f732
2017-09-06 12:19:18 +02:00
hjk
a512c8e0c8 Debugger: Centralize some parameter sanitization
Change-Id: I00e7c22adcf32ba8251b357e75eb9207b6f98f1b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-06 09:57:27 +00:00
Nikolai Kosjar
dce0b1c945 Fix qbs build regarding app_version.h
Change-Id: I2b6bd8bf10221dc3d08ada30701d5b39cc763251
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-06 09:05:29 +00:00
Alessandro Portale
1733076227 Utils: Make the Magnifier icon a proper 16x16px icon
The historical size of 11x17px makes it hard to use.

Change-Id: I17f10d0b03c41f5470c02b6dc47c0c40afac73fe
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-06 08:56:11 +00:00
Alessandro Portale
b3911628cf Core: Clean up some ancient, unused code in FancyTabWidget
Change-Id: I4b24522028c8184f39bd05d54644fee0fba3b434
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-06 08:55:59 +00:00
hjk
3975bc2e19 Debugger: Add a const
Change-Id: I917ab5d654c724c847d3bb91a1c76b485cd18de2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-09-06 08:25:15 +00:00
hjk
7ee3e137bc RemoteLinux: Remove target-specific perf support
The base target-agnostic implementation is good enough to handle the
case.

Change-Id: Ib4615de59c1d5defd297a885ca2ca13ff9e0d3e6
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-09-06 08:24:58 +00:00
Orgad Shaneh
ff9e745e0f Bump version to 4.4.1
Change-Id: Ib65ad133f580fe0cca76ea31752134343b986dd6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-09-06 08:19:27 +00:00
Ulf Hermann
35bdf8e3b8 ScxmlEditor: Fix crash in WarningModel
Destroyed warnings were not properly removed, as qobject_cast on a
QObject that's being destroyed returns nullptr. Also, call
endRemoveRows() to finalize removing of rows, not endResetModel(), and
avoid searching the vector twice.

Change-Id: I70c0ac6ef897496adc71a5010929d71e91666ad4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-09-06 07:54:04 +00:00
Christian Stenger
b381418476 Welcome: Squish: Assign object name to fix Squish tests
Latest change of adding QScrollArea around Welcome's sidebar made
the objects lookup fragile. Using the QScrollArea inside Squish
tests helped for some but not all lookups.
Simplify the lookup by assigning an object name.

Change-Id: I5f37ee69bf20eaf02c9717cbaa5ba541d8ffbc17
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-09-06 07:09:35 +00:00
Ivan Donchevskii
82d0650b11 Clang: fix findStartOfName handling
... of templates and qualified names

Change-Id: Ic8c2dec35cb74484f474c0c608857e7cf48c7468
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-09-05 14:16:04 +00:00
Tobias Hunger
5fb54e7cdd TreeModel: Send modelReset() in setRootItem(...)
Change-Id: Ie24b1888521fe601455a5a15a01f02fb8b30e536
Reviewed-by: hjk <hjk@qt.io>
2017-09-05 14:13:52 +00:00
Christian Stenger
cd51ff7c0f Utils: Fix typo in function name
Change-Id: Ibd973f68d291731dab06ef1b7eee902be19601a5
Reviewed-by: hjk <hjk@qt.io>
2017-09-05 13:49:23 +00:00
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