Commit Graph

63610 Commits

Author SHA1 Message Date
Christian Stenger
ae3bb43dd1 AutoTest: Support registering functions as catch test cases
Task-number: QTCREATORBUG-19740
Change-Id: I60a59d3902e1202d4cf18635bae3ef31806b0aac
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-20 08:43:19 +00:00
Christian Stenger
4e0fa78752 AutoTest: Pull catch tree nodes one level up
This patch makes test cases now match the TestCase node so that possible
additional sections can be functions instead of test data.
Mis-use the TestSuite for the file node that is used to additionally
group the items. The file node is kept - for now - as it seems rather
often that test case names get pretty long names.

Change-Id: I364fc40d1de6a22b6f170b3001f37393b64680aa
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-20 08:43:03 +00:00
Christian Stenger
df830ccf08 AutoTest: Filter interfering arguments for Catch tests
Some of the possible options usable with a Catch test executable
may interfere with what is expected on the AutoTest plugin side.
Other options will be provided by settings that will be added
in a follow-up.

Change-Id: I9613c28c2e0fac8af27c5e8293921933bd570337
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-20 08:42:25 +00:00
Eike Ziller
ad9e4cd2f6 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	src/plugins/android/androidconfigurations.cpp
	src/plugins/qtsupport/qtoptionspage.cpp

Change-Id: I91ee3e771ab630ac3a54be53ac4be6d3c1c46950
2020-04-20 08:40:54 +02:00
Eike Ziller
9e84724c53 Fix "Link with Qt" for Qt offline installers
The Qt offline installers do not necessarily write a QtCreator.ini.
Check for qtversion.xml as well.

Change-Id: Ib7fd9f39444a8eec817646dd495fdc94696906e8
Reviewed-by: hjk <hjk@qt.io>
2020-04-20 06:33:55 +00:00
Assam Boudjelthia
9e057a5536 Android: add support for new SDK Tools package cmdline-tools
The newly added cmdline-tools is not used by Qt Creator.
So QC Android settings will be broken for users who have
an Android SDK installed from Android Studio, or who
updated their SDK package (i.e. tools -> cmdline-tools).

This patch fixes both of the following issues:

1- QC looks for sdkmanager tools under <SDK_ROOT>/tools/bin/sdkmanager,
and with the new SDK it's under
<SDK_ROOT>/cmdline-tools/latest/sdkmanger.

2- QC checks the version of the SDK tools and opens the
old SDK Manager for SDK tools version 25.3.0 or less.
However, since cmdline-tools is now version 1.0, it causes
QC to think this is an old version.

Fixes: QTCREATORBUG-23726
Change-Id: I7e6bbc6840d24d358f68dfa3e229799394ace950
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-18 16:31:36 +00:00
Christian Kandeler
98ce70480a Vcs: Fix output pane
Amends c0c2df203d.

Change-Id: I77d022f2b3a4d3cab4713d9cbd2bc66102ee58a3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-04-17 14:52:12 +00:00
Christian Stenger
ce3306ccb3 AutoTest: Do not inherit from another framework
Commit 91509727e0 had some unexpected side effect.
Amend (or replace) this one by an explicit lookup which
is still a hack, but at least safe to do.

Change-Id: I8fd2e9bdcea18d062f6fc6dd74709c12c16f2cc5
Reviewed-by: hjk <hjk@qt.io>
2020-04-17 14:11:12 +00:00
Tobias Hunger
74a07f906f CMake: Rename some constants
Rename some constants to get a bit more consistency into the
naming scheme. I am so tiered of missing a constant due to it
not having _ in the expected places!

Change-Id: Ibb5e82ea4e25ccb559352839b96c8a64394f3085
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-17 13:24:43 +00:00
BogDan Vatra
fdb0cf0f6b Update openSslPath when we change the android sdk path
Change-Id: I39bd02d4f5bba8d03d4606b0de89b50778c7aa01
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-04-17 13:04:38 +00:00
Thomas Hartmann
f671d46c1d QmlDesigner: Add extra check for invalid node
Change-Id: Id3cb9b6a2eb8230f0e3403fad30c57a67227fa5e
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-17 11:30:18 +00:00
Thomas Hartmann
f9fb5d7e88 QmlDesigner: Fix crash
Change-Id: Iaabc04e97fb7e06d462e7716be27a24471be2bd2
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-17 11:29:29 +00:00
The Qt Project
7e3afa6657 Merge "Merge remote-tracking branch 'origin/4.12'" 2020-04-17 09:45:59 +00:00
Leena Miettinen
6579505b4b Doc: Update info about build settings
Task-number: QTCREATORBUG-23364
Change-Id: I0b929771ca0d11d5ab0eaa19d99f4003783480e3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-17 08:36:08 +00:00
Christian Kandeler
c564805095 Output parsers: Make file look-up self-contained
Change-Id: Iffe104b6b52f0902f1977adeaa0fee3dc1e374a4
Reviewed-by: hjk <hjk@qt.io>
2020-04-17 08:14:14 +00:00
David Schulz
1eacbc98a8 Debugger: add dumper for Utils::Environment
Change-Id: I2e80447b9b9690376a6d789c8b18d33cca22f4ab
Reviewed-by: hjk <hjk@qt.io>
2020-04-17 07:20:45 +00:00
Christian Stenger
91509727e0 AutoTest: Fix Qt Quick Test execution
Qt Quick Tests share their settings with Qt Tests and
have none on their own.
Make the separate handled framework of Qt Quick Test
derive from Qt Test framework to share the settings.
Regression introduced with 2c79196ab5.

Change-Id: I9934b0357365e2739e7a72b114df97f49da6bc50
Reviewed-by: hjk <hjk@qt.io>
2020-04-17 06:53:40 +00:00
Christian Stenger
96fe0aab8d AutoTest: Support missing Catch2 test case macros
Add support for macros defining parameterized test cases
and for test cases using a fixture.

Task-number: QTCREATORBUG-19740
Change-Id: I631009f309cb48d2657acb6e52911e052ff85c5b
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-17 06:53:26 +00:00
Eike Ziller
602d690bab Merge remote-tracking branch 'origin/4.12'
Change-Id: Ie35e9959693b6f6f78509eea5b259d6493ef87f2
2020-04-17 08:09:55 +02:00
hjk
2795292c74 Android: Remove description of ping-pong protocol
Has not been used for a while.

Change-Id: I504ca8e83c388e3b588cc27aa978d1151ccee452
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-16 16:36:32 +00:00
Kai Koehne
e85c074621 Doc: Remove mentioning of Madde, Blackberry support
These are arguably not relevant anymore to explicitly mention
when support got dropped more than 5 years ago.  People
can still find this information in the change log ...

Change-Id: Ib38fa40d7e0200977930bf21925d9b9b975fd8ab
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-16 14:32:27 +00:00
Tobias Hunger
5a7586fca6 QtVersion: Make sure BaseQtVersion environment is set consistently
Change-Id: Ibec67dd25de6d5b17585722b8b92e24cf272ed76
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-16 14:24:01 +00:00
Christian Kandeler
6f32538c5d ProjectExplorer: Split up the IOutputParser class
For symmetry with Utils::OutputFormatter.

Task-number: QTCREATORBUG-22665
Change-Id: I148fed69dba042ad3ef26e080829c31cd3f357fd
Reviewed-by: hjk <hjk@qt.io>
2020-04-16 10:40:33 +00:00
Richard Weickelt
7b1ff65786 Update qbs submodule to HEAD of the 1.16 branch
Change-Id: I8891681d62c107ec7e8dcf44c50f8d4e2dc4a87f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-16 10:31:25 +00:00
Robert Loehning
3837cdac2b Squish: Ignore two fails in tst_rename_file
Neither can I reproduce them without Squish, nor are
they clearly inside the scope which needs testing.

Change-Id: I25494de34cd216678913fbf04dca88c3c0126ed9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-16 10:04:59 +00:00
Tobias Hunger
4d3eea6884 CMake: Pass on extra files to code model
Pass on extra files that are not compiled according to CMake
(== headers) to the code model, so that it has the information
which build system these files are associated with.

This helps a bit with the AutoTest plugin, which wants to scan
files (incl. headers) for tests and needs information on which
build system target will build that test.

This patch fixes e.g. Google Test detection for CMake projects --
but *only* if the header files are actually listed in
CMakeLists.txt. If that is not the case, then the CMake plugin
has no way of knowing which target will build tests.

Task-number: QTCREATORBUG-23843
Change-Id: I1117c63dd052ec29a3bce6cce24c3389eedb2df7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-16 09:56:01 +00:00
Leena Miettinen
9c2393fa69 Doc: Add Python to list of supported languages
Change-Id: I01eed043b951162375d580e7b39dc5af40fec858
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-16 09:15:09 +00:00
Christian Stenger
d04597f2aa AutoTest: Re-implement catch parser
The AST handling is limited and fails for other macros
that will be added later on.
Replace the parser by using a lexer.

Change-Id: Ia11f0a05eec770c703180935a64615e5090b314c
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-16 07:45:19 +00:00
Ulf Hermann
b86dedb3e8 QmlJS: Tolerate extra members in qmltypes
We are going to add more fields to the qmltypes file format. Qt Creator
should not barf on those.

Fixes: QTCREATORBUG-23855
Change-Id: Ibea5a8270d2236d6b9b87ae672a1526107fe8b3b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-16 06:26:17 +00:00
hjk
d7b1adae78 Android: Setup lldb-server path in AndroidRunner
Currently unused, guarded by an always-false m_useLldb flag.

Change-Id: Icedfa4bace3d5160cdc3d4fbcf72a22d74d0aa0f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-16 04:54:22 +00:00
Robert Loehning
38d4ccbdcb Squish: Fix and update tst_rename_file
Change-Id: Idc8134dd0df5df530285525783532c21014087a8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-15 17:15:15 +00:00
Mahmoud Badri
0a447dfec8 QmlDesigner: Fix flow tags not created after import on mac
Task-number: QDS-1220
Change-Id: Iecc1096f83f8f2edb3309854feed04d4c7fe4c9f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-15 17:11:16 +00:00
David Schulz
5b15e7e415 Core: move CodecSelector dialog to Core
Task-number: QTCREATORBUG-23835
Change-Id: I824ae9650c244fffc064ade718fc788fc2908ada
Reviewed-by: hjk <hjk@qt.io>
2020-04-15 16:41:57 +00:00
David Schulz
2f53f58280 DiffEditor: add info bar for documents with encoding errors
... with the option to reload the diff document with another encoding.

Fixes: QTCREATORBUG-23835
Change-Id: I1ce07b292688059b37535f2972970d8ea91be81b
Reviewed-by: hjk <hjk@qt.io>
2020-04-15 16:41:16 +00:00
Leena Miettinen
475a0bd044 Doc: Update info about adding libraries to projects
Task-number: QTCREATORBUG-23364
Change-Id: Iafe73f867891c95fef20ed5681ab10957f30ecf6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-15 15:10:01 +00:00
Leena Miettinen
07350edf44 Doc: Update screenshots to use the Design theme
Change-Id: I5656fa899df7c228ad478de1ed9cf195e534aedc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-15 13:09:17 +00:00
Leena Miettinen
a80c43a9d5 Doc: Update info about creating Qt Quick Application projects
All of them now have the same dialogs and settings, so describe
them only once. Use a shorter version for tutorials.

Task-number: QTCREATORBUG-23364
Change-Id: I2f71f7016aa02b98dcbe1551680dc27737db93f7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-15 13:01:33 +00:00
Christian Stenger
cae7b16a90 AutoTest: Avoid possible nullptr access
Fixes a crash when loading qtdeclarative and parsing
for Qt Quick tests.

Fixes: QTCREATORBUG-23864
Change-Id: I0c88908f578e2dd92341a6fdd427aed5157bb94b
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Richard Weickelt <richard@weickelt.de>
2020-04-15 12:08:17 +00:00
Christian Kandeler
d42920d372 OutputFormatter: Take ownership of the line parsers
For symmetry with IOutputParser.

Task-number: QTCREATORBUG-22665
Change-Id: I92e93b32e87ff4f3fa163a2d2fe13768e56bfa24
Reviewed-by: hjk <hjk@qt.io>
2020-04-15 09:07:17 +00:00
Assam Boudjelthia
54f76d29c0 Android: fix sdkmanager not picking up all marked essential packages
Task-number: QTCREATORBUG-23829
Change-Id: Id436c96a8b9376d10ada92412c154c5aea2a294b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-15 08:18:46 +00:00
Assam Boudjelthia
2d4a2d19ae Android: fix potentiallyy big clone of android_openssl with --depth=1
Change-Id: I839221ee7a3fe8c1dec90d010ecbb492517fcba1
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-15 08:18:09 +00:00
Thomas Hartmann
8c2864b8a5 QmlDesigner: Add styleNamesForFamily()
Change-Id: I1df354fcf0789478ecdc461181ae61a61ae81007
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-15 07:49:20 +00:00
Tobias Hunger
c1dc36011f QmlDesigner: Fix potential nullptr access
Change-Id: I78fe65032857e6ae114076f2563f4b07776d918d
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-15 07:41:22 +00:00
hjk
3a1dc3c3ed Android: Move gdbserver path determination to androidrunnerworker.cpp
That's the only user, and it's easier to extend to handle LLDB there.

Change-Id: I7ce236e2ff509b419d52b10d086a75ff0c2ea14b
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-15 07:14:34 +00:00
hjk
6d66733d50 Android: Rename some gdbServer* to debugServer*
There's LLDB coming into play, and debugServer is what we use on
BareMetal and RemoteLinux, too.

Change-Id: I77f8545ebbe6685708215ac579789f7d4990b7be
Task-number: QTCREATORBUG-23260
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-04-15 07:14:04 +00:00
Leena Miettinen
bba0dbc02f Doc: Update Opening projects topic
Check terminology and update screenshots to use the
Design theme.

Change-Id: I4e62bf2f9af4f93afddfd12801cf2e299a8f9cff
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-15 06:42:45 +00:00
Denis Shienkov
4672aff903 BareMetal: Add support for Keil C166 toolchain on Windows
This commit provides support for the C166 compiler provided by Keil:

* http://www.keil.com/c166/

Now QtC auto-detect installed C166 compiler, its ABI's, headers,
and pre-defined macros. Additionally, we have added the new 'c166'
architecture to the ABI.

Change-Id: I63bd39aff48d19e430b2e58b8b4531c33eaa0e4a
Reviewed-by: hjk <hjk@qt.io>
2020-04-14 18:30:17 +00:00
Christian Kandeler
6c32656a21 QbsProjectManager: Fix crash when unloading a building project
Note that unloading a building project is generally broken in that the
build manager waits indefinitely for the build step's finished() signal,
but that's a general problem which needs to get addressed in a different
patch. This one fixes a qbs-specific crash.

Fixes: QTCREATORBUG-23851
Change-Id: I93e254acd1c73fe7495d01fcad04ea9301130dd0
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-14 15:15:27 +00:00
hjk
ca4908bab5 Android: Make two uses of Target::activeBuildConfiguration() explicit
This avoid the QTC_ASSERT that guards the implicit use in BuildStep::
buildConfiguration(). In the current architecture the use cannot be
avoided, but it goes away when Run and Deploy are moved below Build
instead of Target, as planned.

Change-Id: I6020a0854ea99f0102372341163dda6b4b7a8acd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-14 14:46:12 +00:00
Christian Kandeler
c0c2df203d Utils: Split up OutputFormatter class
An OutputFormatter takes some string and prints it into a text edit.
In addition, it can ask any number of registered OutputLineParsers
whether they think any special formatting should be applied to the
current line.
This mechanism is now properly modeled by our class design, rather than
being hidden in a monolithic class where everything had the same type,
no matter what its purpose was.
Prospective contributors can now simply be pointed to the
OutputLineParser class and will see at one glance what they have to do.

Change-Id: I9844499f062c94fb038ce73fd6f26576910148c2
Reviewed-by: hjk <hjk@qt.io>
2020-04-14 14:15:26 +00:00