Commit Graph

63610 Commits

Author SHA1 Message Date
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
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
Henning Gruendl
eda1439a29 QmlDesigner: Link OutputPane visible to DockWidget
Task-number: QDS-1639
Change-Id: I8f384669d402d961683e85ff237a224b6d26cf34
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-09 13:24:49 +00:00
Henning Gruendl
46481bd884 QmlDesigner: Fix GradientLine tooltip
Change-Id: I88bf3425b4ade5a80d49bb34744248431eec5128
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-09 13:24:26 +00:00
Jochen Seemann
de38285bc3 AutoTest: add support for Catch framework
This adds a basic test and test output parser for the
Catch2 test framework.

Task-number: QTCREATORBUG-19740
Done-with: Christian Stenger <christian.stenger@qt.io>
Change-Id: Ic3322905ab82f414d2a26c325e130142233f72aa
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-04-09 12:46:37 +00:00
Tobias Hunger
13daf11d03 CMake: Simplify BuildDirParameters
Remove some useless bool, Creator would crash if that was ever set.

Change-Id: I148cad6b6139332a6010698f075b584c87dec338
Reviewed-by: hjk <hjk@qt.io>
2020-04-09 12:22:50 +00:00
Tobias Hunger
a53308cde6 CMake: Do not create .cmake directories in source dir
Only initialize the CMakeBuildSystem after the
CMakeBuildConfiguration has been fully set up. The "builddirectory"
was still pointing to the source directory, so creater configured
cmake in the source directory, leading to a useless directory being
left in the source tree that does not belong there.

Fixes: QTCREATORBUG-23816
Change-Id: I7c9b6ae1f8d999043e700cd9f2d56418c22f2abf
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-09 12:22:32 +00:00
Tobias Hunger
34f5e14afe CMake: Remove CBP parser that was used in tealeaf mode
Change-Id: I27be82673800be981c5f60ce0f157ae2b8cfd1e4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-09 12:22:11 +00:00
Eike Ziller
35c5c09c38 Remove unused QTC_PLUGIN_REVISION macros
These were used when the plugins were in separate repositories

Change-Id: Iba06bb1e197e96271f6157b70ffb382b016147f1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-09 11:26:51 +00:00
hjk
ed9f4be3ee RemoteLinux: Use a RemoteLinux.SupportsRSync key
... into the Device::extraData map instead of dedicated accessors.

This weakens the compile time dependencies of the RSyncBuildStep,
LinuxDevice, and GenericLinuxDeviceTester at the price of weaker,
local typesafety for one bool value.

Potentially this could go into the direction of re-using bits
of "device feature" discovery and use. Nothing planned, though.

Change-Id: I9aa6dce8066b82d344f64f38707f17416e273957
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-09 11:19:36 +00:00
Eike Ziller
d347aa4003 CMake build: Support QTC_PLUGIN_REVISION
Change-Id: Icc3735b9b7d0d1fa8a9e8695da3cb39275b96219
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-04-09 10:22:52 +00:00
Eike Ziller
c1c2af670c Fix signing/notarization for QtScript, QML, and opening Terminals
The former two require privileges for executable memory/jit, the latter
uses AppleScript.

Fixes: QTCREATORBUG-23746
Change-Id: I551af0893dc7724d8f7dc3c97fc856eda504d45b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-09 10:17:34 +00:00
Cristian Adam
a1e61fd4b9 CMakeProjectManager: (re)Fix clang code model when CMake PCHs are used
CMake gives the path to the cmake_pch.h[xx] file as relative path
to source directory. Making it absolute fixes the code model.

Fixes: QTCREATORBUG-22888
Change-Id: Ia969ead16bb99a05c955ae96f03596ef25db63ba
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2020-04-09 10:16:18 +00:00
Thomas Hartmann
94cd560636 QmlDesigner: Fix for ActionIndicator
* Fix SpinBoxInput hover
* Fix ActionIndicator when statements
* Add hover state to ButtonRow
* Increase Z
* Show indicator in edit state
  In edit state hover does not work reliable

Change-Id: I7077ad391a7661a14ec784ab43bb31517e252885
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-09 09:19:28 +00:00
Robert Loehning
ec79f42701 Debugger: Update references to Locals and Expressions
These are two separate views now

Change-Id: I010ad0b937982704310d102d1f4338ec0c29a370
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2020-04-09 09:01:16 +00:00
hjk
021cab2048 Utils: Introduce FilePath::operator/(const QString &)
Including some random uses.

This mimics  std::filesystem::operator/(std::filesystem::path).

Change-Id: I0b0f5cf0d962fd33d4cbb9be96645a0b4a21ee03
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-09 07:48:22 +00:00
Leena Miettinen
631da01be2 Doc: Describe locking and pinning curves in curve editor
Change-Id: I6bd580683b3430cc5c2e3ec40e3e25234c5de462
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-09 06:56:23 +00:00
Cristian Adam
12272a392d GitHub Actions: Update Qt, CMake, Ninja versions
Change-Id: If38ad9d521fd25429a2e923219f978ddb40b9117
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-04-08 21:17:12 +00:00
Leena Miettinen
34e8645645 Doc: Update screenshot in Selecting Modes
Change-Id: Ifd8ed029c0eda3e76b28cadd32c985a9868fbb00
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-04-08 14:09:09 +00:00
Leena Miettinen
fdf25cc79b Doc: Update info about opening example projects
If you select a Qt for Android or Qt for iOS version, only
examples tested for Android or iOS are listed.

Task-number: QTCREATORBUG-23364
Change-Id: Id47265f8057a5b199813f3de0811749eeb348a29
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-04-08 13:35:07 +00:00
Fabian Kosmale
7627e5f84e Fix highlighting for new QML keywords in Qt 5.15
Change-Id: I2e45321eccb209fa9c9c524d85dc9e08d8bd23fa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-04-08 12:10:50 +00:00
Leena Miettinen
013e794ec0 Doc: Update Qt Quick app tutorial
Task-number: QTCREATORBUG-23364
Change-Id: Ib5fc260219a2e29c0762456e8b3c8d7e82954043
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-08 11:50:33 +00:00
Thomas Hartmann
0a1dcd2498 QmlDesigner: Add string support to ComboBox
This allows setting raw strings.

Change-Id: I372b933db071ea724236c22d9562c464744de7fc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-04-08 11:14:28 +00:00
Mahmoud Badri
cdb2f9b64b Fix mac build
Change-Id: If89e734255ee84daeb0db68f60eef3f39d865943
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-04-08 11:13:38 +00:00
Andre Hartmann
e3abd5b348 JsonWizard: Fix restoreLastHistoryItem for LineEdit
The value was successfully loaded from the history,
but overwritten again.

Let's now check if the line edit already contains
a value (loaded from history) before setting the
default text.

Change-Id: Ic0acad83f76e0aca76309dfd213183a210d334ac
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-04-08 10:45:03 +00:00
Christian Kandeler
98fb412e6e IOutputParser: Replace std{Out,Err} with a single parameterized function
Another step towards parser/formatter unification.

Task-number: QTCREATORBUG-22665
Change-Id: I6de86b3aee2c54585cdd4b06d21b0ea67300aeac
Reviewed-by: hjk <hjk@qt.io>
2020-04-08 09:31:33 +00:00