Commit Graph

61421 Commits

Author SHA1 Message Date
Christian Kandeler
2896e5f5e2 MSVC support: Fix "detection" of supported ABIs for the 2015 build tools
The VS 2015 Build Tools are unlike any other VS or Build Tools
installation and thus need their own hack.

Fixes: QTCREATORBUG-22960
Change-Id: Icdbc2ad641e544a9a9d58887fde30b6ad3c28d26
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2019-10-09 07:21:11 +00:00
Cristian Adam
87023db572 CMake Build: Properly build qtcreatorcdbext
Change-Id: I8b4a58d79124debd877442fe23798c77bff723c5
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-08 13:26:53 +00:00
Eike Ziller
33bf017951 Version bump -> 4.10.2
Change-Id: I7ce0fbc735df662485f86dca8e148d1aee5b3657
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-08 13:26:52 +00:00
Leena Miettinen
7031ffd327 Doc: Fix link to free Qt apps
Fixes: QTCREATORBUG-23059
Change-Id: Iaf0b181223f88aa6f9513a29825f8aa98f9baf62
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-08 13:25:38 +00:00
Eike Ziller
a19d905ea5 Merge remote-tracking branch 'origin/4.10' into 4.11
Change-Id: I9b53d00dbc79d52e52f6e18761e6a6c6faec6c84
2019-10-08 15:21:12 +02:00
Eike Ziller
a3f5fa09f5 Show examples also of "invalid" Qt versions
As long as we are able to find examples or demos for them.
Android Qt versions can be "invalid" until the device settings are
fixed, but that doesn't prevent us from showing examples.

Task-number: QTCREATORBUG-23058
Change-Id: I8d3351a3f31727b062b37f5bd462709a9d6ef9dd
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2019-10-08 13:15:48 +00:00
David Schulz
e37b764079 Qmldesignerplugin: fix qbs build again
Change-Id: I2751248e1c131768d8830f567e2d2527e76be4ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2019-10-08 13:13:54 +00:00
David Schulz
5c3d499cc4 Help/litehtml: fix cmake build on windows
Complains that
'/RTC1' and '/O2' command-line options are incompatible

Change-Id: I9dc075dce2eaaf4df01791ece84a2ebd9bed04f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-08 13:09:49 +00:00
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
Nikolai Kosjar
2a8a39f12b Deploy clazy-standalone for the ClangTools plugin
Change-Id: If554d3ade48da8d3877770d7e42af7185b30ceb6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-08 07:52:17 +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
Leena Miettinen
83671ebdae Doc: Chrome Trace Format Visualizer
Fixes: QTCREATORBUG-23024
Change-Id: I8caac6521a9962e64ab09932ab6177099d48086e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-10-07 08:27:33 +00:00
Nikolai Kosjar
ea0b7e4563 QmlJS: Fix build of tst_check.cpp
tst_check.cpp:151:36: error: reference to 'Type' is ambiguous
In file included from src/libs/qmljs/qmljscheck.h:30:0,
 src/libs/qmljs/qmljsstaticanalysismessage.h:42:6:
	note: candidates are: enum QmlJS::StaticAnalysis::Type
 src/libs/qmljs/parser/qmljsast_p.h:347:46:
	note:                 class QmlJS::AST::Type

Change-Id: I2f2af3e19fc0cbb7cef359c28d5f5d1505778882
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2019-10-07 08:03:46 +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
Orgad Shaneh
efb135d07e Changelog: Fix wrong description
The process priority is not configurable. It always starts with low
priority.

Change-Id: Ic49f999df87a83d18787904471785fc8542a9d29
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-04 14:11:26 +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
The Qt Project
77cf25751e Merge "Merge remote-tracking branch 'origin/4.10' into 4.11" into 4.11 2019-10-04 10:24:07 +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
Cristian Adam
7651ba50fc CMake Build: Add IDE_COPYRIGHT_YEAR
The About dialog was looking weird: "Copyright 2008 - "

Change-Id: I74b7117f6abce831adc3fd66042b777dbcfd1b67
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-04 10:18:18 +00:00
Christian Stenger
ea829fa6d5 Squish: Workaround bad focus issue when using Squish
When interacting with the file dialog QC seems to lose its
focus and never gets it completely back.
This in turn makes lots of short cuts useless and (context)
menu entries disappear or being disabled.
Avoid this by explicitly closing the popup of the line edit
if there is one.

Change-Id: I79f86b3133d2d0780d73d75e15416d59f35dfa1e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
v4.10.1
2019-10-02 19:32:00 +00: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
Henning Gruendl
1347515da6 QmlDesigner: Fix ComboBox model issue
This patch enables the ComboBox to properly show models which aren't
raw arrays (e.g. a data model that has multiple named roles).

Change-Id: I126f157e4da04afb768be40190c23720367b3419
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-10-02 12:52:11 +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
Leena Miettinen
6613185933 Doc: Override platform default value for showing shortcuts
...in the labels of context menu items.

Task-number: QTCREATORBUG-22502
Change-Id: I981c595b2c368575f3dbc0c5ef9f7ac60d4eb36d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2019-10-02 09:47:23 +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