Commit Graph

47434 Commits

Author SHA1 Message Date
David Schulz
ac47d51bfb Bookmark: Add command to edit a bookmark
This command opens the edit dialog for the bookmark that is at the
current editors text cursor. If there is no bookmark at that position a
new bookmark will be added before the edit dialog is opened.

Fixes: QTCREATORBUG-25696
Change-Id: I6a63a87cbbfb9d9075fac25b7ed9dd59d135b2c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-10 11:56:13 +00:00
Eike Ziller
6bb918adab Merge remote-tracking branch 'origin/4.15'
Change-Id: Ic839ab43a723ab22cc83e5b0d823ec6121cb6701
2021-05-10 13:50:58 +02:00
hjk
771f1ef6d6 Utils: Rename SychronousProcess::terminate to stopProcess
To align with QtcProcess.

Change-Id: I02e739b55ec95d5f516037de38b4f6228859809f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-10 11:47:40 +00:00
hjk
d825805c39 Utils: Use std::function instead of signal SynchronousProcess callback
Simpler interface and use.

Change-Id: I8db448b7ccd12927b8f8fd347b0a92c3f76f7114
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-05-10 11:40:25 +00:00
David Schulz
c4605ebc07 TextEditor: Fix painting text mark icons
Only take text marks with icons into account when looking for the three
textmarks with the highest priority to be drawn next to the line number.

Fixes: QTCREATORBUG-25427
Change-Id: I9c0b9cac2e34134e59071a4e2357585b3071c303
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-10 11:18:16 +00:00
Cristian Adam
3229903e8a QNX: Fix list of remote processes on Windows
The command that listed the process included a format string which
was enclosed with double quotes.

Double quotes were causing escape problems on Windows while generating
the ssh command line.

Change-Id: I722b8ad027b7fc4eda184c16926a78040678767c
Reviewed-by: hjk <hjk@qt.io>
2021-05-10 10:37:23 +00:00
hjk
c23cdd9262 Utils: Merge {synchronous,qtc}process.{h,cpp} file pairs
Mechanical to prepare merging the actual classes.
Adapting #includes.

Change-Id: I77a2c28129287778bc870c30cb890cd26bc2e62b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-10 09:47:51 +00:00
Eike Ziller
040d0cc1ef Android: Fix AVD display if there are no AVDs
Fix that a broken dummy item was shown in the AVD Manager tab in the
Android options, if no AVD is available.

Fixes: QTCREATORBUG-19338
Change-Id: I31550812c332ff78d107d79682e064aa9eae1070
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-10 09:47:12 +00:00
Eike Ziller
c213b93aff Android: Make avd output parsing testable
And add some tests

Change-Id: Ife0e0c60f55251a1ac23215055ece8fb01478d59
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-05-10 09:47:04 +00:00
Christian Stenger
c1abbf0802 AutoTest: Fix checkstate evaluation
When the last item of a test got modified and gets a
different state than the rest of its siblings we failed
to set the resulting state of its parent to partially
checked.

Fixes: QTCREATORBUG-25702
Change-Id: I122b77b907dfa7fd14c31d8363b025254e0c115e
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-10 07:48:21 +00:00
Cristian Adam
768787fc86 QNX: Use pidin instead of ps for device tester
QNX uses their own ps command named pidin for doing process listing.
QnxDeviceProcessList::listProcessesCommandLine() uses pidin.

ps doesn't exist and it causes the device testing to fail.

Change-Id: I9de7895fd6ba4e19f6f27e599f240c67c9ed2b4d
Reviewed-by: hjk <hjk@qt.io>
2021-05-07 15:00:42 +00:00
Christian Kandeler
cf21db02a5 ProjectExplorer: Restrain the LdParser
We cannot blindly catch any string with two colons in it.
Use a whitelist instead. We can easily extend it when needed.

Fixes: QTCREATORBUG-25677
Change-Id: I72f63860584af51220d6c4b71c07d2355f6bb57c
Reviewed-by: hjk <hjk@qt.io>
2021-05-07 14:15:28 +00:00
Christian Kandeler
a0e3f4bcc5 ProjectExplorer: Do not look for compiler messages in LdParser
Task-number: QTCREATORBUG-25677
Change-Id: I33ff8adc1267a59787b0d7007a0733f649bfcec6
Reviewed-by: hjk <hjk@qt.io>
2021-05-07 14:15:11 +00:00
Christian Kandeler
ed1ed2aa24 RemoteLinux: Fix "make install" step
Was mangled in 42ab5c84b9.

Fixes: QTCREATORBUG-25359
Change-Id: I0a4f69fc72433548d44461c3c7c02bd53708d12d
Reviewed-by: hjk <hjk@qt.io>
2021-05-07 14:14:22 +00:00
hjk
c262f40b67 Utils: Re-do 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: I87d84ea2206995d5069265f8df78f40cf2ba8a36
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-05-07 14:09:56 +00:00
Cristian Adam
ee33fd6409 DebuggerItem: Pass environment to debugger probing
QNX 7.1.0 requires that the QNX specific environment variables are
present at the time of running the gdb executable.

Without this the QNX Device configuration fails with the:
"Configuration already exists or is invalid"

Change-Id: I1cb8da58247247ac8248cb613f73e2e28d350e9e
Reviewed-by: hjk <hjk@qt.io>
2021-05-07 13:45:35 +00:00
hjk
2c70ad63d1 Utils: Move SynchronousProcess::locateBinary to QtcProcess
Change-Id: I1df5008f8f33d25f208ab8be13b4a6e72c901be2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-07 12:47:38 +00:00
David Schulz
7fb592fe0c CppTools: Fix UI freeze on project update
Do not wait for the previous update to finish before starting the next
update.

Amends: 6d7e5eb8d1

Change-Id: Ic8d43b56949cbf024832afc85e54a31db29b11ac
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-07 11:28:05 +00:00
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
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
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
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
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