Commit Graph

69993 Commits

Author SHA1 Message Date
Christian Kandeler
9c3420120e CppTools: Parse non-project sources with default kit
This makes more sense than using the clang defaults.

Task-number: QTCREATORBUG-25562
Change-Id: I796d29bb4e81e5e257efea998dcab037efd8a717
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-07 11:03:47 +00:00
Eike Ziller
448446bd7e Fix build after merge
Change-Id: I424cb312d7ede82890d46cd9b09260babb11f62f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-07 09:22:08 +00:00
Eike Ziller
bf5b1d714c Revert "Revert "Merge remote-tracking branch 'origin/4.15'""
This reverts commit f0a86d4510.

Reverting a merge doesn't "undo" it - the changes would be lost
forever even with subsequent merges.
So we need to revert the revert to get the changes.

Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-05-07 09:07:40 +00:00
hjk
635993fbdc Revert "Utils: Replace SynchronousCommand::flags by a named bool"
This reverts commit c617632e4d9291f1b50ec0c7e1a914a6a689284e.

To early, dependencies missing.

Change-Id: I91433aebbaf2c04cbb212585deb3cde5f3208974
Reviewed-by: hjk <hjk@qt.io>
2021-05-07 08:35:58 +00:00
hjk
9a7a0098a3 Utils: Replace SynchronousCommand::flags by a named bool
The potential extensibility was never used, and a similar use case
in QtcProcess (setLowPriority()) used a named setter.

Change-Id: I77d84ea2206995d5069265f8df78f40cf2ba8a36
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-05-07 08:24:18 +00:00
hjk
40e2bb2551 Tests: Port manual/process to QtcProcess
Change-Id: I50d489e47f61927745f63b37dae3e3567355414f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-07 08:23:15 +00:00
hjk
9995b82612 Utils: Remove SynchronousProcess::stopProcess
Handled by QtcProcess::stopProcess nowadays.

Change-Id: I5acf7db470f9b75989edc18e48c9a48e01b50868
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-07 08:19:23 +00:00
Christian Kandeler
ef21aacf1f ProjectExplorer: Remove some Qt-specific parser tests
Warnings from uic and moc should be caught by the QtParser, not by the
LdParser, as they currently are.
We move the uic test case to QtSupport, and we remove the three
identical moc test cases, as the exact same output is already checked in
QtSupport.

Task-number: QTCREATORBUG-25677
Change-Id: Iec0203c2be60a80bd6ef0a090a9828f59ae6b482
Reviewed-by: hjk <hjk@qt.io>
2021-05-07 08:10:34 +00:00
hjk
bcb3efb3c6 Android: Use Utils::FilePaths instead of QStringList in JavaParser
Change-Id: I50cce4bd32ed494f2b68a9a3b7f6cb9108b92f66
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-07 07:50:13 +00:00
hjk
d71c725453 Utils: Delete QtcProcess::{setP,p}rocessEnvironment
Enforces the use of {setE,e}nvironment for better control.

Change-Id: Iffd9ee4604a6735ee886ecc7623a58729ecd245a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-07 07:49:04 +00:00
hjk
19380100e9 Core: Use QtcProcess instead of SynchronousProcess helpers in PatchTool
Change-Id: I8acb326579bf4bf201fb94d1b3b0db65eed51a55
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-07 07:33:35 +00:00
Christian Stenger
d7c659fa87 AutoTest: Support upcoming Catch2 v3
Fixes: QTCREATORBUG-25582
Change-Id: I6ba7184d63aa6dd2b5b86d2d7d420297b59bef15
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-07 05:02:46 +00:00
Christian Stenger
03624f9a68 Debugger: Do not omit original stack
..if loading the qml stack failed, e.g. when using a Qt
without debug information.

Task-number: QTCREATORBUG-25554
Change-Id: Ibe2a051f4dc0a9d3c15a63f663f5934a476d6fc4
Reviewed-by: hjk <hjk@qt.io>
2021-05-07 04:21:21 +00:00
Marco Bubke
f0a86d4510 Revert "Merge remote-tracking branch 'origin/4.15'"
This reverts commit 888ca0dd20.

Reason for revert: wrong patchset

Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-05-06 15:30:02 +00:00
Kai Köhne
53c0b82a93 Add "Minimal required Qt version: Qt 6" option to QQ application wizards
Provide a Qt 6 option that does not use any versioned imports.

Also make Qt 5.15 the new default.

Fixes: QTCREATORBUG-24973
Change-Id: I43714e5e344d1d91d35c5ad298edf28bc32ff7d6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-06 15:00:24 +00:00
The Qt Project
84c37d5c27 Merge "Merge remote-tracking branch 'origin/4.15'" 2021-05-06 14:10:24 +00:00
hjk
75ededf4a9 Debugger: Implement "Load QML Stack" feature for LLDB
Fixes: QTCREATORBUG-25554
Change-Id: Ieafa22581c294d9b993efe077354750a8f986424
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-06 14:07:12 +00:00
Tim Jenssen
26a824184c ProjectExplorer: fix Qt5 cmake build
amends 201786d3fc

Change-Id: Icc629252e985fe5380b96c3ce7531982fe5898d5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-06 13:58:59 +00:00
hjk
29b58f3488 ProjectExplorer: Remove some unneeded #includes
Change-Id: I08cdf8bb02a1cc394dc0698d1eaa5341ab82aa71
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-06 13:12:00 +00:00
Knud Dollereder
d5daa1d0bb Improve stability of the curve editor
- Clear the CurveEditor when deleting a timeline
- Prevent value-axis computation with invalid values
- Prevent invalid values when animation curves contain one keyframe only
- Set the dirty flag when deleting a keyframe in order to properly
  delete it
- Fix autoscrolling for the timeline editor

Fixes: QDS-4115
Fixes: QDS-4081
Fixes: QDS-4080
Fixes: QDS-3251
Change-Id: I3bc8406ac57f30b16bccc2e1c164a84502de7750
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 12:40:10 +00:00
Mitch Curtis
357e70279c Update usages of Qt Quick Controls 2 styles
The Default style was renamed to Basic
(9219e86aa571d8b2f5da1ec92a461e5add38f57c) and we now default to a
platform-specific style (8b534487044dfb3b464431ecb91ef4e0864af4ed) if
available.

Task-number: QTBUG-85984
Task-number: QTBUG-86403
Change-Id: I66d2188a0c45605abdbbd8c71396b16407166d75
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 12:39:32 +00:00
Michael Winkelmann
93e4794114 Annotation: toJsonValue / fromJsonValue
Change-Id: I743176a90cf617a6bcdb988f3c34d0fc232a001d
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 11:45:32 +00:00
Tim Jenssen
888ca0dd20 Merge remote-tracking branch 'origin/4.15'
Conflicts:
	src/libs/sqlite/sqlitebasestatement.h
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: I0fa0a8a7feffed24c0d2bc26eca86590f1156755
2021-05-06 13:07:48 +02:00
David Schulz
0938452199 LanguageClient: remove unnecessary member function calls
Change-Id: I27e626cdef9c8f645cc1ea2f79ec6cfda09342fb
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
2021-05-06 10:48:09 +00:00
Christian Kandeler
201786d3fc ProjectExplorer: Prevent target switch on project that's to be removed
Switching targets starts up a lot of machinery that is undesired for a
project that's going away.
The same goes for switching build configurations on a target that is
being removed.

Fixes: QTCREATORBUG-25655
Change-Id: I0cb6e395cca8f89bfeb70fcdf571bbcb64f94247
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-06 10:08:24 +00:00
Christian Stenger
eafba223a5 QmlJS: Add test for recursive declared items
Tweak the test to allow multiple messages per line.

Task-number: QTCREATORBUG-24615
Change-Id: I662ab4801794dc3e49f68667f634337a847bc503
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-05-06 09:31:20 +00:00
Christian Stenger
fd64253a62 QmlJS: Suppress wrong warning
When a type is created inside a file with the same name
do not warn if the created type is namespaced.

Fixes: QTCREATORBUG-24615
Change-Id: Icb2b1a9fd1a02ee222084b676ee818eed65a7c93
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-05-06 09:31:12 +00:00
Thomas Hartmann
11dcdb74ef QmlDesigner: Rename activateTimeline() to setCurrentTimeline()
Change-Id: Ie6932e79eb99b318629557b9f419ae2da1500833
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 09:15:45 +00:00
Thomas Hartmann
0f2af19780 QmlDesigner: Activate created timeline
Change-Id: I2b8ba374ed463c9062035a9b5b0d2e8209819c4d
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 09:15:33 +00:00
Thomas Hartmann
e72cd12962 QmlDesigner: Use AbstractView::currentTimeline in TimelineWidget
AbstractView: :currentTimeline is the method that should be used.

Change-Id: I256b03691c114d44f807ce6a29f1f32f612545c9
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 09:14:00 +00:00
Thomas Hartmann
e6d2e81c07 QmlDesigner: Make explicit how we collect the current timeline
The method graphicsScene()->currentTimeline() should not be used anymore.

Change-Id: Ib05df55c66a962dd7b129759ea330dd83efbc04e
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 09:13:43 +00:00
Thomas Hartmann
4022e330fb QmlDesigner: Use AbstractView::currentTimeline
There should be only 'one' current timeline. Let's keep the QTC_ASSERT
until we know this does not introduce issues.

Change-Id: I1518bef39b290732bda5dc6e5fc571c33f7407f2
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 09:13:29 +00:00
Thomas Hartmann
638db3c35b QmlDesigner: Remove the custom notification "INSERT_KEYFRAME"
Adding a keyframe can be done directly in the PropertyEditor.

Change-Id: I38fa87a8bcf4f551890c4ada748301cdeea9f165
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 09:13:15 +00:00
Thomas Hartmann
8ae81f5a40 QmlDesigner: Use QmlTimeline::insertKeyframe in TimelineView
Change-Id: I22df18aba407b9c49a3aceb46169fd90efe73942
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 09:13:02 +00:00
Thomas Hartmann
1077ceefd8 QmlDesigner: Add insertKeyframe to QmlTimeline
Change-Id: I405cab4ece5420098ee9d5b3ce823d2b4c1d9339
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 09:12:50 +00:00
Thomas Hartmann
2da6b66210 QmlDesigner: Use local timeline
We should not use m_graphicsScene->currentTimeline() from the widget.

Change-Id: If31e57884622722818bc1b3254bda98434e65c1e
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 09:11:53 +00:00
Tim Jenssen
fb26650d86 QmlPuppet: fix crash when multilanguage database is used
amends 81a36ac0ef

Change-Id: Ib4143432704569c84a57540a07f75fa2044aaf0e
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-05-06 09:01:43 +00:00
Tim Jenssen
97a9327746 QmlPuppet: reorder includes
Change-Id: If73f76aee81feef160feeb87c78644e26e36072d
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-05-06 09:00:49 +00:00
Thomas Hartmann
0059f6af74 QmlDesigner: Define RegExpValidator in HelperWidgets
In Qt 6 there is no RegExpValidator anymore.
To support both Qt 5 and Qt 6 we register our own RegExpValidator
in HelperWidgets if we compile with Qt 6.

Change-Id: I7e66cbf3e29dd034a1c96a22e233058cb7a892e3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 08:33:33 +00:00
Thomas Hartmann
8bfdb39d71 QmlDesigner: Fix InternalConstants for Qt 6
Change-Id: I1f516b4d350c88154dfe193d0833b28b1b46c7e2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 08:33:23 +00:00
Thomas Hartmann
80f6f22061 QmlDesigner: Do not define extra stream operators for QList
This is not required and creates issues with Qt 6.

Change-Id: I74e875fe785d5baa4d0688d0ef86a9151750e56c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-06 08:32:53 +00:00
Jarek Kobus
dc88306983 ClangModelManagerSupport: Add future synchronizer for started tasks
Task-number: QTCREATORBUG-25678
Change-Id: I0031f64b3d80cfcff6b9625bd2d57ea228382c80
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-06 08:22:22 +00:00
Thiago Macieira
f8d04c0732 Add missing #include
A local, unpushed change highlighted it.

qmldebugtranslationclient.cpp:47:42: error: use of deleted function ‘QYouForgotToDeclareStreamingOperators& operator<<(QDataStream&, T) [with T = QUrl]’

I really don't understand how this could compile even without my change.

Change-Id: I9f583ca106d24f048885fffd167c35c9e614c786
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-05-06 07:42:55 +00:00
Christian Stenger
80f61a5db9 AutoTest: Extract data gathering and parse result creation
Function processDocument() became to huge. Beside this it
might be needed to re-use functionality partially.

Change-Id: I4c31caa4458c165938c3d6f1170d8ac4806d2af1
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-06 07:19:42 +00:00
Eike Ziller
6689f0e5f4 Fix dropping files onto image viewer
Interactive QGraphicsViews eat all drag&drop events. Since we don't want
the view to be "interactive" anyhow, just set it to non-interactive.
Dragging the image around if it is larger than the view is not
implemented via drag&drop events, so it still works.

Fixes: QTCREATORBUG-25462
Change-Id: Iee403bab7ba83f897b4d2cca662c4e82ae4aa529
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-06 07:15:43 +00:00
Marco Bubke
1618937637 Sqlite: Use config.h instead of setting everything in the build files
Change-Id: Ia70a5e78475a8b8078276df03330060c8785bf90
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-05 15:14:49 +00:00
Marco Bubke
f8647ec428 Sqlite: Enable SQLITE_DEBUG for debug
Change-Id: I086dc07ae7672d1077f8469eccac5ce34d56c04d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-05 15:14:44 +00:00
Marco Bubke
81a36ac0ef Sqlite: Optimize the initialization
https: //www.sqlite.org/compile.html#omit_autoinit

Change-Id: Iaa91203be21f01a19235a9401cb4fa412eca8276
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-05 15:14:37 +00:00
Marco Bubke
8edbdd78ad Sqlite: Default column type to None
None has no type affinity. So it will not try to convert types to other
types like Numeric will do.

Change-Id: I5362a6d071459594619485b8b8a37b3f5ed12db6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-05 15:14:18 +00:00
Marco Bubke
385158ddcc Sqlite: Remove unused function
Change-Id: I3ce625c1c097c9f6e66c378c3b708397c09c6980
Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-05 15:13:59 +00:00