Commit Graph

50019 Commits

Author SHA1 Message Date
Eike Ziller
331358752c Android: Improve error message for "invalid" Qt versions
AndroidQtVersion reports as invalid also if NDK or SDK are not
configured, or there are other errors in Devices > Android, so point the
user there.

Fixes: QTCREATORBUG-23058
Change-Id: Ic81d0663552769f78b0121ee3e1ddfc1f6510c11
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-10-08 12:34:02 +00:00
Nikolai Kosjar
54fefd89b8 C++: Transfer noexcept specifier for refactoring actions
This applies for e.g.

* "Add Definition..." (on function decl)
* "Move Definition..." (on function decl)
* "Insert Virtual Functions of Base Class" (on class specifier)

Fixes: QTCREATORBUG-11849
Fixes: QTCREATORBUG-19699
Change-Id: I0d259bc1782470f3b3f19617230005a5594a5cca
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-10-08 09:20:10 +00:00
Alessandro Portale
c2aaa93408 QmlDesigner: Fix CMake build
add qmlvisualnode.cpp and qml3dnode.cpp

Change-Id: I3b7326ec461ccbed7c0472e95dd406510be00566
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-10-08 09:04:27 +00:00
Orgad Shaneh
0267608a6c ProjectExplorer: Deduplicate strings for setting keys
Change-Id: I90b951213933815dcf3537da280c32f60a30ad18
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-08 08:58:02 +00:00
Orgad Shaneh
d26140e7f1 Qmake: Show real effective make call on Make step - take 2
Include custom Makefile.

Change-Id: Ibc6a341590f8b1ff0da2fa87f5e5bcd75182b6a7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-08 08:33:25 +00:00
Orgad Shaneh
92c067ba36 ProjectExplorer: Add a setting for low build priority
Default is false.

Task-number: QTCREATORBUG-23048
Change-Id: I0f0cc787229456aad2ddf47e4ef37bad58af2038
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-08 08:19:16 +00:00
Antonio Di Monaco
f0bd0a8baf Debugger: Fix missing watch highlight when the value changes
This patch fixes a regression introduced by
e95fd876aa

Change-Id: I8cb277858ef6c63cd26c03417f9dfeb99d96cb45
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-08 08:11:20 +00:00
David Schulz
5b127dd088 Debugger: Fix out of memory crash when receiving regular output
Change-Id: Icda28ec56c191e62812a4e5219a1df902c5e60a1
Fixes: QTCREATORBUG-22733
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-08 06:19:05 +00:00
Christian Stenger
ed2dadae02 QmlDesigner: Fix Qbs and QMake build
Amends eb744cb412.

Change-Id: I7c02c09ccb15f7c2e6f315bc1473098e7997b671
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-10-08 05:03:14 +00:00
Thomas Hartmann
eb744cb412 QmlDesigner: Introduce QmlVisualNode and Qml3DNode
We have to support QQuick3DNodes for the timeline and states editor.
QmlVisualNode aggregates the shared properties between QQuickItem and
QQuick3DNodes. Both have states and are visual nodes shown in the
navigator.

Task-number: QDS-1102
Change-Id: Iab8c20921012bb751caeafb1c2ee91c0d8922b2e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2019-10-07 14:15:41 +00:00
Orgad Shaneh
0b1e6599c9 Debugger: Fix MSVC warning
Using QObject::connect without capturing 'this'.

Change-Id: I64e61e897760002888d7a11771bd2dc36e640c72
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-07 13:17:34 +00:00
Mahmoud Badri
ef9085b310 Correct timeline selection rect. vertical bounds
When the timeline graphics view has no vertical scolling, the vertical
scroll bar value is 0. The patch makes sure the min value is at least
the ruler height.

Change-Id: Ibc49dacbe8d5c90c50c929ede03b1e89b18386cf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-07 12:19:34 +00:00
Christian Kandeler
425732f810 QMake: Let the user decide whether to run a make step for subdir builds
Amends 66237a6e04.

Fixes: QTCREATORBUG-22956
Change-Id: I1c611a281eb0c2bad1f066a9753e685595b1eee1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2019-10-07 11:41:16 +00:00
Orgad Shaneh
962ca920d8 Clang: Support skip warnings with LLVM9
+ move the macro to its single user.

Change-Id: I141357386e62f44f096ce4c50124cea8f618fb21
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-07 09:12:27 +00:00
Nikolai Kosjar
942ff625fe QmlDesigner: Fix build
Change-Id: Ib1da09be2532327dfd5dc4b0f5b0ba717e8e1130
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2019-10-07 07:47:50 +00:00
Ulf Hermann
58d35f8a64 QmlJS: Update QML parser using the one from qtdeclarative 5.15
We need to do this because the new "required" keyword should be
recognized by Qt Creator.

This is not a verbatim copy of the QML parser from qtdeclarative. A few
data structures have changed that would require large scale changes in
otherwise unrelated parts of the code. For example, all Visitors need to
handle recursion depth errors now and the DiagnosticMessage only has
line and column now, no longer begin and legth.

Change-Id: Iea5b04e27b07e0cba55d64b844315af9828acbf7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-07 07:33:58 +00:00
Mahmoud Badri
979d14525c Make animation conform to playhead snapping
When playhead snapping in on, make animation update based on the snapped
frames (not in between frames). Also the current frame text shows just
the snapped frames values.

Task-number: QDS-1068
Change-Id: I6309975fda3d96ce3bc2ae1582b42b62b340112c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-07 07:15:40 +00:00
Mahmoud Badri
2c2ffa8273 Implement keyframes snapping
When shift is down while dragging keyframe(s), they snap to ruler ticks,
keyframes, and the playhead.

Task-number: QDS-1068
Change-Id: Iea5fec9e578d3f1db51c429cbd565ad145a90fe8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-07 07:14:04 +00:00
Mahmoud Badri
69719e7b3e Implement playhead snapping
When Shift is down, playhead snaps to ruler ticks and keyframes.

Task-number: QDS-1068
Change-Id: Ie793c3041c00ff01ec42f6045e1f3c44fc02da2c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-10-07 07:13:02 +00:00
Eike Ziller
f866319c16 Fix build with GCC 5.3
It doesn't like overriding the same variable name within a ranged for
loop.

Change-Id: Ie326d6535d1556ffc809a7551e131740858d7dc2
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-04 15:06:31 +00:00
Miikka Heikkinen
f58dca918f Add import options to asset import dialog
Available import options are queried from the importer and displayed
on the import dialog.

Change-Id: Id47dde29f41a1c91042623ebbd1156c77434e3a3
Fixes: QDS-1101
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-04 11:30:35 +00:00
Eike Ziller
a0f3ce69bd Revert "Revert "Designer: Fix look-up of resources for UI files""
This reverts commit d907df0349.
The original change was pushed to 4.10 and reverted there for
binary compatibility reasons. Revert the revert here.

 Conflicts:
	src/plugins/projectexplorer/projectnodes.h

Change-Id: Ibfd84a30a6cfdd78e1fa1b1c61785d391a5a18be
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-04 11:17:16 +00:00
Eike Ziller
4f0ffcecbe Merge remote-tracking branch 'origin/4.10' into 4.11
Conflicts:
	src/plugins/projectexplorer/projectnodes.h

Change-Id: Ibd255105a01c53a1f81a1ec7b30495dfef1877a9
2019-10-04 12:19:32 +02:00
hjk
e8d5e6c808 ProjectExplorer: Run Settings: Move environment settings further up
Adding the global aspects last, not first, more or less
accidentally does the right thing.

Fixes: QTCREATORBUG-22669
Change-Id: Iaf3eb4382974335471fff2f409ea4df7ef8f81b3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2019-10-02 14:46:27 +00:00
Cristian Adam
93ec10754f CppTools: Make code model on "cl" mode more robust
Unknown command line options starting with / are now transformed
into commands starting with -, which will cause unknown commands
warnings in libclang.

The / commands cause errors because they are treated as missing
files.

Fixes: QTCREATORBUG-22871
Change-Id: I75f7878ab6a7951df24c954ccff1c298ea65f839
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-02 13:43:22 +00:00
Nikolai Kosjar
6ec8017bc6 Clang: Build against LLVM/Clang 9
Change-Id: I3608bca6541614bb55e67d35c87334957cd02761
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2019-10-02 13:20:13 +00:00
Christian Kandeler
d907df0349 Revert "Designer: Fix look-up of resources for UI files"
This reverts commit 736eef24ca,
which breaks binary compatibility.

Change-Id: I696ad3e6efc6f02f595356c9864d69629eeef8bf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-02 12:44:06 +00:00
hjk
005a03ccd4 Debugger: (Sub-)Aspectify DebuggerRunConfigurationAspect
Change-Id: If7fcc52a88dec02061c4e0cce4aa48d1b923ceb2
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-10-02 11:52:16 +00:00
David Schulz
6d5c61b164 Python: Add virtual env name to auto detected interpreters
Change-Id: Ia4d2e5399aa983b6bca510ca8b0e6848da5f769a
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2019-10-02 10:32:31 +00:00
David Schulz
aa8ce0ba24 Python: remove unused static string
Change-Id: I4357157d98f039c654b16de4e469c18c32bbb0ed
Reviewed-by: hjk <hjk@qt.io>
2019-10-02 10:32:17 +00:00
Cristian Adam
99b0ed42a3 CMake Build: Add cpaster tool
Fixes: QTCREATORBUG-22805
Change-Id: Ib63b9e9896e73789b234b3c4be4cde447e60fdf4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-02 09:04:57 +00:00
Eike Ziller
2c45abef4b Merge remote-tracking branch 'origin/master' into 4.11
Change-Id: Ia99614078444b3b7e1e8473b6d2708f21e89e315
2019-10-02 07:37:13 +02:00
Eike Ziller
ac014e3875 Merge remote-tracking branch 'origin/4.10' into 4.11
Conflicts:
	src/plugins/projectexplorer/projectnodes.h

Change-Id: I10a749cca38c2d0929cf4d2b74ab089e14b6157b
2019-10-02 07:32:57 +02:00
Thomas Hartmann
8fd26ab893 QmlDesigner: Increase size of SetFrameDialog
The dialog was a bit too small.

Change-Id: Id10d6c0789abe802009214f4799ed25e9812f690
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-10-01 16:06:41 +00:00
Christian Kandeler
8c0906e8fb ProjectExplorer: Make the session list in the management dialog sortable
Fixes: QTCREATORBUG-22911
Change-Id: I2110e00428d65f347fa83cd7b11f54084517be9a
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 15:04:52 +00:00
hjk
312ff692b0 Debugger: Do not crash when displaying uninitialized QImages
Fixes: QTCREATORBUG-23031
Change-Id: I074cdaf509edac6e5659d2e976ed7188e8944d81
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-01 14:57:14 +00:00
Nikolai Kosjar
092bdbc0a1 Clang: Reduce built-in diagnostic configs
Change-Id: Ieb7c712916f0b3ddd08b04cccf97fc0fa1f828d4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-01 14:42:38 +00:00
Nikolai Kosjar
a0a39a0470 ClangTools: Make file selection dialog searchable/filterable
Allow filtering for open and edited documents.
Add also search functionality (triggerable by e.g. Ctrl+F).

Change-Id: Ib41400abfd3b81371afddd56b88ff1b9bf8b9bcd
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-01 14:42:01 +00:00
Nikolai Kosjar
9fd4b25638 ClangTools: State diagnostic config on start
...in application output pane.

Change-Id: I3c630494b3e1283a2455d241cda048a89a02e9ab
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2019-10-01 14:40:56 +00:00
Cristian Adam
6e7236e23a CMake Build: Add qtcreator_ctrlc_stub build
Change-Id: I22185098bbf6c9a8bdf0f48f82b463a0ebd850c5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-01 14:22:33 +00:00
Christian Kandeler
030fd96d18 SSH: Ignore connection timeout with Microsoft's OpenSSH
The Microsoft-provided ssh binaries misinterpret the connection timeout
in that they only start to connect after that period has passed, which
slows down the connection process. So let's not use the timeout option
there.

Change-Id: I5a5335c7f1b4af04f1afb5603ab0f1a518e8c95e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2019-10-01 14:10:36 +00:00
Nikolai Kosjar
b895dfa382 Clang/ClangTools: Separate custom diagnostic configs
Add a separate pool of custom diagnostic configs for the
ClangTools plugin. That is, the diagnostic configs in

  Menu: Tools > C++ > Code Model

are not shared anymore with the configs at

  Menu: Tools > Analyzer > ClangTools

On plugin initialization of ClangTools, move tidy/clazy related configs
to ClangTools.

Change-Id: Id06087a58b53e466a3d7bbac669550c5fbe9899d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-01 14:10:28 +00:00
Nikolai Kosjar
d2648db914 ClangTools: Clean up plugin tests
We can provide the run settings explicitly instead of writing to the
settings.

Change-Id: Ibb9ef0280c14315ff7ba72be75dfd04c50d84484
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-01 13:51:42 +00:00
Christian Kandeler
44ddc028b5 Wizards: Make sure project combobox uses same sorting as project tree
Fixes: QTCREATORBUG-22876
Change-Id: Ia8817851a263e6ba3aad7ac0d316b7277ad0240e
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 13:13:51 +00:00
Mahmoud Badri
f9b225ae88 Some timeline visual updates and corrections
- Selection rect selects keyframes based on center point rather than
the whole keyframe.
- Make playhead vertical line extend to the whole height of the
timeline widget.
- Prevent a jump when dragging a selection of keyframes.
- Prevent dragging keyframes if the clicked keyframe is deselected
(i.e. Ctrl+click a selected keyframe).
- Correct timeline bounds checking while dragging multiple keyframes.

Task-number: QDS-1073
Change-Id: Ibf118ecccfe86346f2d4e921c0958294a15c24f1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-01 13:07:04 +00:00
Cristian Adam
171ad72b7a Build fix for qmldesigner
Build broke in 47ee781394

Change-Id: Iffd26cfe7778ded7802afe5cf317ca104b95b970
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-10-01 12:05:46 +00:00
Henning Gruendl
15bf546ff9 QmlDesigner: Fix attached property handling
* Add margins to the list of attached properties
 * Add handling of margins change

Change-Id: I4630169ce07a4903360962b7c8d9fb6d4c01df13
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-10-01 11:52:11 +00:00
Tobias Hunger
7debb513e2 BaseQtVersion: Remove getters for configValues and qtConfigValues
They are unused.

Change-Id: I4350fe33af24e418eb318518f7ca66301d9a7519
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 11:47:00 +00:00
Tobias Hunger
b489bfd615 BaseQtVersion: remove qmakeProperty(...) getter
Qt 6 will not use qmake to identify a Qt version, so this can not
be part of the public interface of BaseQtVersion anymore.

Provide getters for the information actually read via qmakeProperty(...).

Use the getters whenever possible.

Change-Id: Iadbee80b75e4f8b06caf90e7ed69fae2029b4dd7
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 11:46:43 +00:00
Eike Ziller
123aa77c49 Help/litehtml: Guard against out-of-bounds scroll values
If we set the value of the scrollbar to an invalid value, nothing gets
repainted, so we need to take the branch that calls update explicitly in
that case.

Change-Id: I700c690119b1ee2fe8b88d77c29e00f329810448
Reviewed-by: hjk <hjk@qt.io>
2019-10-01 11:32:41 +00:00