Commit Graph

67787 Commits

Author SHA1 Message Date
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
Leena Miettinen
d973823dbb Doc: Describe selecting the help viewer backend
You can switch the help viewer backend if you have issues
with the current one.

Change-Id: I0b0697980259a4d14b6e694faff0afed14040556
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-14 13:54:23 +00:00
Christian Kandeler
70bddbcab4 Utils: Dissolve the AggregatingOutputFormatter class
Inheritance is not the right design here (anymore), so we merge the
derived class into the base for now. We will later re-split in a more
sensible manner.

Change-Id: I326e9f02287b3070f47147c771f3fa908d51b7fb
Reviewed-by: hjk <hjk@qt.io>
2020-04-14 13:47:59 +00:00
Leena Miettinen
3f513799b4 Doc: Update info about using Git
Update text and screenshots.

Task-number: QTCREATORBUG-23364
Change-Id: Id936d35374fca7ababbbfa35fef507d1cc371786
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-04-14 13:02:37 +00:00
Alessandro Portale
f2f65be346 McuSupport: Fix RH850 kit issues
- Let user provide Green Hills Software Compiler and
  Renesas Graphics Library
- Set GHS_COMPILER_DIR and RGL_DIR instead of ARMGCC_DIR and
  SEGGER_JLINK_SOFTWARE_AND_DOCUMENTATION_PATH
- Don't set Kit compilers
- Do not set CMAKE_CXX_COMPILER and CMAKE_C_COMPILER
- Set ghs.cmake as CMake toolchain file

For the RGL package, McuPackage::updateStatus() was extended to be able
to work without a provided "detection path".

Task-number: QTCREATORBUG-23822
Change-Id: I5b666c258a965ce55047111fbbeca80271170892
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-04-14 12:51:40 +00:00
Alessandro Portale
7b188a6fff McuSupport: Use MCUXpresso IDE instead of SEGGER JLink for NXP kits
Qt for MCUs for NXP, now requires MCUXpresso in order to flash and run,
instead of SEGGER JLink. This change adjusts the kit creation
accordingly.

Task-number: QTCREATORBUG-23821
Change-Id: I0f5e375d052246ba033f0f2f81a7bad1805df02e
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-04-14 12:51:03 +00:00
Alessandro Portale
f0f12fabd6 McuSupport: Fix Desktop kit issues
- Use "Desktop" instead of "Qt" in kit name
- Set the right kit toolchain (and debugger)
- Unset Qt Version (and hide it from kit)
- Prepend Qul_DIR/bin to environment PATH (if no CMake fileApi)

This also gets rid of the ugly mcuTargetIsDesktop() function
in favor of the new McuToolChainPackage::TypeDesktop

Task-number: QTCREATORBUG-23820
Change-Id: I5af61d5b0f414b4441239494e99b0b15088eee76
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-04-14 12:45:03 +00:00
hjk
37b079a19c Debugger: Some FileName cosmetics
Use {from,to}Variant for settings, and one time fromUserInput is enough.

Change-Id: I5774f425a4c775b0d78b87c60eabf7f48d78a082
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-14 12:30:32 +00:00
David Schulz
d5e09223bf TextEditor: Allow using CodecSelector with BaseTextDocuments
Task-number: QTCREATORBUG-23835
Change-Id: I56133dbf22fdae9f2fec37d0ffd2a35de5fb1ad5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-14 11:23:49 +00:00
Leena Miettinen
fc879d196f Doc: Update widget-based app tutorial
Task-number: QTCREATORBUG-23364
Change-Id: Iedc02d8e774093d176e6ccd881f096d9b3163a60
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-14 10:54:55 +00:00
Orgad Shaneh
d3ebd70ab2 CMake: Fix GCC warning
cmakeparser.cpp: In member function ‘virtual ProjectExplorer::IOutputParser::Status CMakeProjectManager::CMakeParser::doHandleLine(const QString&, Utils::OutputFormat)’:
cmakeparser.cpp:143:1: warning: control reaches end of non-void function [-Wreturn-type]
  143 | }
      | ^

Change-Id: I876e096d965444b9b72ef0dddcbc52e7a201eb02
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-14 10:32:36 +00:00
Christian Kandeler
0f16378188 OutputFormatter: Do all formatting centrally
Instead of working directly on the text edit, the specialized
OutputFormatter classes now simply ask the base class to do it for them.
In practice, the request currently always is "turn this part of the text
into a link", but the interface can be extended to other types of
formatting, should that ever be required.
This is a win/win situation: Derived classes no longer have to fiddle
with QTextCursor & friends (nor do they have to call any base class
functions), while the base class can make strong assumptions about what
the derived class does to the text edit (i.e.: nothing).

Change-Id: Icc4bc52d4001b0359247563e39a206fa274833d7
Reviewed-by: hjk <hjk@qt.io>
2020-04-14 09:46:34 +00:00
Robert Loehning
b85ed5fa67 Update German translation
Change-Id: Id8654ce21bd6db9c26aeaebee53c7965536a6abf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-14 08:46:04 +00:00
Thomas Hartmann
97a8873885 QmlDesigner: Set FlowPosition only in flow mode
Change-Id: I169b7a5cea8a5eb4794d9ba12cdf50312fc4d154
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-14 08:25:40 +00:00
Eike Ziller
deb0eaf795 Merge remote-tracking branch 'origin/4.12'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I34c3d1fd5be90537e37d15e00b1a0d455d1bf81d
2020-04-14 09:47:38 +02:00
hjk
e86a2bfdd2 Android: Simplify some PathChooser accesses
Change-Id: I270e7f662a2c148252e1b70166a784af8d0e0933
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-14 07:02:07 +00:00
Orgad Shaneh
0b57675d40 Git: Simplify diff editor controllers
Change-Id: I3c1fb205a1197d6c3a457067eb2b7f355f28c55c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-04-14 05:25:08 +00:00
Sergey Belyashov
af061c81b7 Update Russian translation
Change-Id: I6aa5f53e28639aa4f7426cef577138661ba9617e
Reviewed-by: Viacheslav Tertychnyi <tvk537@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2020-04-12 05:28:33 +00:00
Orgad Shaneh
9e3bbf36f2 Git: Change some functions in GitClient to const
Change-Id: Iefd3e0345c7a507d1d5c225ea81677e7a93df295
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-04-10 14:18:56 +00:00
Orgad Shaneh
c86c4d54e2 Git: Fix order of arguments on branch diff
When there is a command in progress.

Change-Id: I73e8378283fcc34f324f862daaf2529b6a0f1265
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-04-10 06:01:31 +00:00
hjk
68c539bb9d Utils: Replace FileChooser::path() by filePath().toString()
Keep the old method for now to ease downstream porting.

The change is kept mechanical, there's a lot of cleanup possible now
on the user code side.

Change-Id: I936baedd45b7ba057f1c789a1bec896886f48eff
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2020-04-09 17:45:06 +00:00
hjk
79b680e7f0 Utils: Rename PathChooser::{f,setF}ileName() to {f,setF}ilePath()
It's returning a FilePath, so it's a better fit.

Keep the old versions as inline function now to ease downstream migration.

Change-Id: I535887928018f42b92895c8b0c82527f0d55e5ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2020-04-09 17:30:23 +00:00
Henning Gruendl
bba553e383 QmlDesigner: Fix connection
Task-number: QDS-1639
Change-Id: I10d5e9c4945f7e6afeced5a67a58eb71eb1a4608
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-09 15:14:46 +00:00
Aleksei German
c2de17b280 QmlDesigner: Rich Text Editor integration
Change-Id: I36403a596b1d4c8241663a4b0e5b1d0e2f9cb45e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-09 14:55:52 +00:00
Christian Kandeler
45ba9fcd53 Output parsers: Replace the chaining approach
Use "flat" aggregation instead.
This is another step towards the formatter/parser merger.
Along the way, also fix some some subclasses (mostly in BareMetal) that
erroneously forwarded handled output to other parsers.

Task-number: QTCREATORBUG-22665
Change-Id: I12947349ca663d2e6bbfc99efd069d69e2b54969
Reviewed-by: hjk <hjk@qt.io>
2020-04-09 14:49:32 +00:00
Christian Kandeler
fb56c82abf QbsProjectManager: Fix one more build key inconsistency
Amends 26e4a2a758.

Fixes: QTCREATORBUG-23841
Change-Id: Ie297f8e2b6a79f6bafa709bf3a0285c9ce6e03ab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-09 14:48:58 +00:00
Leena Miettinen
97560e1ca6 Doc: Fix 3D editor icon filenames
Task-number: QTCREATORBUG-23364
Change-Id: I0cfe1b5040eea9675f9b7508c5a6486beffd5adb
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
2020-04-09 13:57:46 +00:00
Eike Ziller
fa517bd72a Fix build
Amends 13daf11d03

Change-Id: Id29430cd41d522cd5b4b8b1767b4d29a68c97dd5
Reviewed-by: hjk <hjk@qt.io>
2020-04-09 13:35:51 +00:00