Commit Graph

69993 Commits

Author SHA1 Message Date
Christian Kandeler
da8b3f237a qbs build: Prefer KSyntaxHighlighting from system
Note that the system package will only be found with qbs >= 1.20.

Change-Id: I361b774d6b35fdbd0386144d4e9812f02f7841e5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-11 14:30:18 +00:00
Eike Ziller
1ea3d707c6 Fix build with Qt 6
Amends e9abd60732

Change-Id: Ifae84785683343467672b52f29d560aae9757bfd
Reviewed-by: hjk <hjk@qt.io>
2021-05-11 14:13:25 +00:00
Henning Gruendl
4e7ce6284a QmlDesigner: Fix states editor reset model
Task-number: QDS-4336
Change-Id: I4b20d372438e977afc6eb4b27361c97c5d8da6dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-05-11 14:01:20 +00:00
Eike Ziller
e7c1910824 Fix CMake build
Amends b66a403f36

Change-Id: I2d104839a6b8510986ce6f3443ba9fb083460c07
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-11 13:35:21 +00:00
Eike Ziller
f18ac508e8 Move CommandLine out of fileutils.h
to ProcessArgs and rename the files to commandline.*.
fileutils was a strange place for CommandLine, and this
reduces the dependencies needed for sdktool.

Change-Id: I9d7e8ffe8a3560f5d12934457b086f9446976883
Reviewed-by: hjk <hjk@qt.io>
2021-05-11 13:27:23 +00:00
hjk
0c8d8c6b2a Utils: Don't expose Utils::defaultExitCodeInterpreter
Instead, make its behavior implicit if none is given.

Change-Id: I3c1a054751a0afe22d0f40a2fed6dd00b5aef205
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-11 13:15:25 +00:00
hjk
ad5b34ab3e Utils: Remove QtcProcess::{is,set}Synchronous
This reverts a bit of fe8fbf1a4a which was over-shooting API-wise.

Change-Id: Iac4c2b9fa550f7ec0b0aa8deea8c3fc6b6ddcfba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-11 12:49:08 +00:00
hjk
4c09a6e6b2 Debuggger: Compile fix after moving ProcessArgs class into filepair
The .pro files list dependencies explicitly.

Change-Id: Ie84202f6c34057bf87cc8f27fbb45f78f105e9a5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-11 12:30:10 +00:00
hjk
9877460dd6 Utils: Move ProcessArgs class into filepair of its own
There's not much interaction between ProcessArgs and QtcProcess
and both .cpp are still quite big, with non-trivial bits.

Change-Id: Id84202f6c34057bf87cc8f27fbb45f78f105e9a5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-11 12:14:52 +00:00
Christian Kandeler
f6eba42522 qbs build: Use exportingProduct in Export items
The use of product in Export items is deprecated and will be removed in
one of the next qbs versions.

Change-Id: I2644a69012db4a4b4842066784913f4160d3d80a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-11 11:40:37 +00:00
Jarek Kobus
2007aceab0 Make SemanticHighlighter::run() cancelable
In case the task needs to be canceled, stop doing its job
and return as soon as possible.

Change-Id: Id5a3462d9f0a19eda782aebdd4c25407318118db
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-11 10:03:34 +00:00
Jarek Kobus
1e26327472 Synchronize all started threads in SemanticHighlighter d'tor
This fixes a possible crash on session switch or on shutdown.

Task-number: QTCREATORBUG-25708
Change-Id: I5dcc2420dca27b9856f47616c6f465ae8f059942
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-11 10:03:16 +00:00
Eike Ziller
b66a403f36 Enhance qtc_add_resources with CONDITION
like most other functions

Amends 201786d3fc

Change-Id: Id35b9730dd6c9b55e80b99068a8ec98d30538705
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-05-11 10:02:14 +00:00
hjk
7cb7e221bd ClangTools: Avoid one use of mutable ProcessArgs::iterator
splitArgs() is more compact and sufficient here.

Change-Id: I789b9ee37899b3d26bd4fabea7ab1756a6d8ac2b
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-05-11 10:00:25 +00:00
hjk
f2f40efa03 Utils: Move process arguments class out of QtcProcess
The main QtcProcess interface is nowadays a CommandLine, with no
explicit references left to QtcProcess::Arguments and related static
helper functions, so it only clutters the QtcProcess class interface

So move these items out of QtcProcess, later potentially to a separate
file pair.

Change-Id: I45c300b656f5b30e2e2717232c855fdd97c2d1d7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-11 09:45:24 +00:00
hjk
8aafe36d01 Utils: Inline QtcProcessPrivate::processStd{Out,Err}
Less indirection.

Change-Id: Iff05c36b20d046a08725ebcb3c03931b6fd8aeab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-11 07:40:47 +00:00
hjk
cad7671da0 Utils: Move most of SynchronousProcess to QtcProcess
Merge the pimpls, move the remaining functions to the base.

This leaves SynchronousProcess as a QtcProcess with an internal
special setup. Plan is still to unify this completely.

Change-Id: Ie95d35ace23a1b7e078174ea37b9fd70a3ebe178
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-11 07:33:54 +00:00
hjk
a4b5479695 Utils: Base SynchronousProcess on QtcProcess
This is the last intermediate step before unification to keep the
merge small.

Change-Id: I5b320f9db4c467c49a384f665cea5e16bfef4f60
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-11 06:34:17 +00:00
Eike Ziller
eb99d1bc6c Fix build with Qt 6
No automatic casting to QFuture<void> anymore.

Change-Id: I878975b972799f763f1a29b94f61d4a12c3a6710
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-10 14:05:24 +00:00
Andre Hartmann
6bbe508e38 Task: Add column information to compiler output tasks
Allows to directly jump to the problematic code
location in the editor.

Done for GCC and Clang which both use the format:
  file:line:column

Not done for MSVC, as this compiler uses the format:
  file(line)
and does not include column information.

It seems like clang-cl does use the format:
  file(line,column)
but the existing parsers were not prepared for
that and were therefore left unchanged for now.

Change-Id: I182634e1c5c941b19801ecafb69fa2b8f91f9d7a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-10 13:49:28 +00:00
Christian Kandeler
7cc2b149b1 qbs build: Make ImageViewer build with Qt 6
Change-Id: If934d2df162e043102ba65d9c3de4fb7fc121540
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-10 13:36:34 +00:00
Andre Hartmann
9e9bd383bc FileUtils: Simplify statement
Change-Id: I9db62241c81c2ffc25c2caa34524e4c98ef01ed1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-10 13:18:11 +00:00
Christian Kandeler
71e3de38b3 RemoteLinux: Fix MakeInstallStep widget again
Change-Id: I8522085334eade413dc12cb418e2addb2615f9e0
Reviewed-by: hjk <hjk@qt.io>
2021-05-10 13:11:00 +00:00
Eike Ziller
988c416425 Fix build after merge
Change-Id: I350630bdc4fb34ea1d443aee1c8b3c823fc1e6a8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-05-10 13:05:02 +00:00
Miikka Heikkinen
9f33f76a97 QmlPuppet: Fix crash when editing importing 3D component
Fixes: QDS-4334
Change-Id: I03c79ae7e51d6821823e19d813eba483ec5981c7
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2021-05-10 12:46:26 +00:00
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
hjk
e9abd60732 Utils: Pimpl QtcProcess
Change-Id: I51d68ad760c181bfcedcd73d216a0535479ba39f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-10 07:38:53 +00:00
hjk
6f53022a11 Utils: Merge TerminalControllingProcess into QtcProcess
Effectively only a single flag controlling a call to setsid().

Change-Id: I6a2be35df1bddc81702575678ee3a065a71cecf5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-10 07:38:42 +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
Christian Kandeler
8d44ae5d7e sqlite: Fix qbs build
Change-Id: I919fd20c445510231e66c08d3dafd5c1b5696ac7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-07 14:14:10 +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
Kai Köhne
1e80ed9b78 Qt Quick Wizards: Remove Qt versions older than Qt 5.12
That doesn't mean we don't support older versions. But I don't think
we should advertise creating new projects for it.

Change-Id: Ia9b97cc072232238baffd10b159f604f1a6413d1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-07 13:18:41 +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
hjk
a61e81272e Utils: Remove unused SyncronousProcess::createProcess
Change-Id: I6be9c4d197c29192036dc872471553b23035c159
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-07 12:45:16 +00:00
hjk
e10b5a4dbb Utils: Remove SynchronousProcess::readDataFromProcess helper
QtcProcess can do that nowadays.

Change-Id: Ic3b08146263da2eb189f043eb743c621c18b82c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-05-07 12:42:18 +00:00
Eike Ziller
64d7b6dda1 COIN: Use Qt 6.1.0 release
Change-Id: Iaf5838e940c1449b3ea2a0dd12b88a43036116e8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-05-07 12:29:16 +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