Commit Graph

67787 Commits

Author SHA1 Message Date
Johanna Vanhatapio
7634282896 Doc: Fix missing image
Fixes: QDS-2622
Change-Id: Ie9b8ec1f8a15e8be9c70e7f2ef65e8ee6b1c5470
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-08-14 07:30:08 +00:00
hjk
e62044aa29 Use Qt::SkipEmptyParts unconditionally
Squashes a warning in qmldebugtranslationwidget and is safe to use
with Qt 5.14.

Change-Id: I1912e7379a570a17fbf057b87390a63d524ced49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-14 06:41:46 +00:00
Christian Stenger
7c60f10bf9 QmlDesigner: Fix compile before Qt5.15
Change-Id: I0f2f363a691dda1a79f773ebf7885a68fbfcbaa9
Reviewed-by: hjk <hjk@qt.io>
2020-08-14 05:23:57 +00:00
Marco Bubke
428d82c6bc QmlDesigner: Reactivate stream capturing
Change-Id: I041392e490bb4e104e917f4164d7d82bae03c2d8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-13 15:07:40 +00:00
Christian Kandeler
760d91665f TextEditor: Make threshold for automatic completion configurable
Fixes: QTCREATORBUG-19920
Change-Id: Id6be79485b1fb8c2ab4cce2706816949ae5e217b
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-13 13:49:44 +00:00
Christian Kandeler
7576ead1dd QmlDesigner: Fix qbs build
Change-Id: Ie4c565635798b0295165244d923df7cc3c64c0b8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-13 13:06:24 +00:00
Marco Bubke
bfddaf6f9f QmlDesigner: Fix linux build
Change-Id: I32f560e18def0a72f2b94ab2fa9e8b6ea20f1bc4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-13 12:36:30 +00:00
Eike Ziller
cf3531b115 Fix links to some tutorials
Fixes: QTCREATORBUG-24315
Change-Id: I6ec9f3b3710cc1043dec394253621e0098449f01
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-13 12:28:31 +00:00
hjk
89296a98a0 Qt6: Adapt to removed QMap functionality
QMap::iterator::operator+() was removed in 14090760a8, necessitating
extra code using std::next/prev to workaround.

QMap::unite is gone, the replacement QMap::insert was only introduced
in 5.15.

QMap key values need to have an operator==() available.

Task-number: QTCREATORBUG-24098
Change-Id: Ic4cf429ab18cad58b1218180de40eb65586afd77
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2020-08-13 12:11:36 +00:00
Eike Ziller
0c4135e380 Merge remote-tracking branch 'origin/4.13' into master
Conflicts:
	src/plugins/android/androiddeployqtstep.cpp

Change-Id: Id624bad384050d567efba0700046331086cb12dd
2020-08-13 13:28:33 +02:00
Assam Boudjelthia
54b1aaed03 Android: warn about wrong ABI in issues pane instead of general messages
Change-Id: I7b11b0b91f2843ee3d95d86b9afc772295dd6e94
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-13 10:49:18 +00:00
The Qt Project
56e4595fd8 Merge "Merge remote-tracking branch 'origin/qds-1.59' into 4.13" into 4.13 2020-08-13 10:43:48 +00:00
Aleksei German
66122492a6 QmlDesigner: Extend Connections view support
- Connection view support to components
 - Connection view support to singletons
 - Minor reparenting improvements
Task: QDS-2411

Change-Id: I337535012dbb3d3a1722d75d89156463eabb8a4c
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2020-08-13 10:32:16 +00:00
The Qt Project
94f6113990 Merge "Merge remote-tracking branch 'origin/4.13' into master" 2020-08-13 09:47:14 +00:00
David Schulz
f95659403b Editor: Propose full trigger match snippets
Snippets might insert a lot more text than just the completion item text
so don't hide a completion if the trigger is typed in completely. But do
not show completions when we type in a snippet with a trigger that can
be also interpreted as a keyword or ordinary completion item.

Change-Id: I25afe5f566e1c8f30621e2f82356c1c5f0af1311
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-13 09:46:15 +00:00
Eike Ziller
f296ed1328 Merge remote-tracking branch 'origin/4.13' into master
Change-Id: I1c426d95eedd82bd4470a64a9bafd734d23081ac
2020-08-13 11:41:32 +02:00
hjk
96474eecc7 ProjectExplorer: Fixup aspectized MakeStep
- Postpone OverrideMakeflag label creation until it is needed.
  This also fixes a leak as in the un-shown case when it never got a parent.

- Use the widget as guard object in update connections. The widget (and the
  aspects' widgets parented to it) gets destroyed e.g. when the active build
  configuration is switched.

- For extra snake oil, put the step widget in a QPointer in updateDetail.

Fixes: QTCREATORBUG-24469
Change-Id: I919cf4956848f7c95ad0441096079ec40666b04e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-13 09:25:57 +00:00
Johanna Vanhatapio
3e1d204c32 Doc: Edit Maya export options
Fixes: QDS-2124
Change-Id: Iefc42fdcc168c7eb41220525a2ef061541fa066f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-08-13 08:38:10 +00:00
David Schulz
7d4d57165c Editor: Update current argument in function hint
Notify the codeassistant that something has changed when the function
hint widget is visible and a key was released.

Fixes: QTCREATORBUG-24449
Change-Id: Iab6c6a13fd91485b077fbd1a812a16e32d558596
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-13 06:48:51 +00:00
David Schulz
2ca4010f2d LSP: use DocumentUri as workspaceFolder
Fixes: QTCREATORBUG-24452
Change-Id: I596138e658118f7b348c22e67d60d153f547fdfa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-13 06:44:06 +00:00
David Schulz
5eb9054a35 LSP: fix capitalization of workspaceFolders
Task-number: QTCREATORBUG-24452
Change-Id: I6ab042972314de45d98034c361b7a11f8fa0024b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-13 06:43:55 +00:00
Tim Jenssen
4fe5b923cd Merge remote-tracking branch 'origin/qds-1.59' into 4.13
Change-Id: Ic720f3adab305c5ef8cd10e713ccabf510eff0c0
2020-08-13 06:39:40 +00:00
Marco Bubke
24ca17f714 QmlDesigner: Fix cmake build
Change-Id: Ib36b4806deb5dd41cf123ceae7dd1e973d843730
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-13 06:27:20 +00:00
Marco Bubke
dc870f538d Prepare merge of qds-1.59 to 4.13
It is not compiling but we are closing this branch anyway.

Change-Id: If96318175d92ae492871d668d5c937c473fd05d5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-08-13 06:24:10 +00:00
Eike Ziller
5e75c86e4d Update 4.13 change log
Change-Id: I074616ab0b213079a26c4d91492d7238272c4356
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-13 06:21:46 +00:00
Leander Schulten
32ee29cb9e CppEditor: Implement remove using namespace Quickfix
Fixes: QTCREATORBUG-24392
Change-Id: Iaf4df4ebf161a4a757f59f22e692e0f9b99cd63c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-12 13:32:20 +00:00
Christian Kandeler
0222d5007e TextEditor: After refactoring, do not open the same document again
... if it is already visible in a different split view. Activate that
one instead.

Fixes: QTCREATORBUG-13145
Change-Id: I5facfb23e8e8163d8653c7926d5bf6848f42bd9a
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-12 12:31:54 +00:00
Alessandro Portale
2d61932387 CMakeProjectManager: Give InitialCMakeArguments a macroExpander icon
Change-Id: Ia1025f2fcecd018ff106fd6b8b9e1cc640af500e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-12 11:44:17 +00:00
Venugopal Shivashankar
7ae7034666 Doc: Update info. for the MCU tutorial
Apparently the conference talk materials
are suppose to use "Talk" prefix and
tag, whereas the online material should
use the "Online" prefix and the "video"
tag instead.

Change-Id: I40c92cc241aae2f6648c8e0701a74db6010b2af0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
qds/v1.6.0-beta1
2020-08-12 09:31:53 +00:00
Christian Kandeler
a7305a60e0 CMake: Parse project on initial load
When opening a project for the first time, the project has already been
added to the session when the BuildSystem object is created, whereas the
code expected a different order.

Fixes: QTCREATORBUG-24318
Change-Id: I8ccfeab7da4e566670f61bfe677a293033bdfe44
Reviewed-by: hjk <hjk@qt.io>
2020-08-12 09:13:33 +00:00
Alessandro Portale
a0463ba46c CMakeProjectManager: Give build config widgets the place they deserve
Change-Id: I10563b6b8820a9f4debbc4ca5fcbc50ba7f7a009
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-12 09:11:02 +00:00
Alessandro Portale
da3b83589b Core: Consider scroll bar when positioning the VariableChooser
Change-Id: Ia9fcade4f32bc852d5519c984b6e84ab443e044e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-12 08:36:35 +00:00
Christian Kandeler
0615d0ec06 CPlusPlus: Fix expectations in preprocessor autotest
... regarding unfinished macro calls.
Amends df0ffd8bb8.

Change-Id: Ia7b8752860ac9207e702697cbee87f16a39dd1dd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-12 08:21:32 +00:00
Christian Kandeler
1f72edcda9 Wizards: Fix crash
... if the project has no classes.
Apparently, one must not call QFutureInterface::reportsResults() with an
empty list, so prevent that.
Also, for simplicity, make sure we have only one possible point of
deletion for the watcher.

Change-Id: I68c3813459533ced86610e88bea81b6a9d170ca5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-12 08:21:12 +00:00
Leena Miettinen
e45ddaa40f Doc: Describe the Transition Editor view in Design Mode
Fixes: QDS-2183
Change-Id: I1dac82af6b7d831d23fc7c93fa7750719f1578d1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-12 07:41:44 +00:00
hjk
27c3550d44 Debugger: Fix crash when trying to remove all breakpoints of a file
Change-Id: Iea4478804be7b32a2da924e1163c5c4944c6e8a4
Fixes: QTCREATORBUG-24306
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2020-08-12 07:25:28 +00:00
Tobias Hunger
6c4c7ec751 ProjectExplorer: Document how ProjectExplorer::BuildSystem interacts
Document how ProjectExplorer::BuildSystem interacts with its
surrounding in a sequence diagram stored in buildsystem.md.

Change-Id: I1419ac63af73e382440f42a168bb103dec8d4b0c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-08-12 06:06:13 +00:00
Robert Loehning
1b63091314 Clang: Use QString::arg to build the string
Change-Id: Iec04857b67d2f84ccc824ef85a015ead32ec2c61
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-11 17:34:51 +00:00
Leena Miettinen
501e7c2fdd Doc: Describe changing the name of a custom output parser
Change-Id: I5980f993f831de60910bea3986c2a01cdaed2dbb
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
v4.13.0-rc1
2020-08-11 13:51:16 +00:00
Johanna Vanhatapio
7d68707a01 Doc: Describe the 3D effects in QDS
Fixes: QDS-2224
Change-Id: I8d5737af34805e75eb74a3fe86591f86e99b6d4b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2020-08-11 12:44:56 +00:00
Christian Kandeler
868236886a Utils::Environment: Extend autotest
... to cover the diff/apply mechanism.

Change-Id: I7d9e794792d6730e935c99c66062ea417dc65fe7
Reviewed-by: hjk <hjk@qt.io>
2020-08-11 12:13:23 +00:00
Robert Loehning
8d1851a39c EnvironmentWidget: Remove superfluous white space
Change-Id: Ib2a2d0b38f0808e4892f87bd753712cb33f1f8d6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-11 11:38:29 +00:00
Robert Loehning
a53cd311e5 Android: Remove trailing white spaces from translated strings
Change-Id: Ie88b3bcd8f5e5c04bcd639924c278871245fad70
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-11 11:38:02 +00:00
Robert Loehning
d4332534de Android: Don't scream at the user
Change-Id: I20ebad6ad2c314394b2c9c90cb9b63e871b2dfb4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2020-08-11 11:37:36 +00:00
Leena Miettinen
46d703274d Doc: Describe using custom output parsers
Change-Id: I423091cfa1d64f640ef6be62c86cf38cb82fe4d7
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2020-08-11 10:39:02 +00:00
Christian Kandeler
7938320291 TextEditor: Introduce shortcut for forcing a function hint proposal
... and support it in the ClangCodeModel.
This allows users to get function signature(s) displayed regardless of
where exactly the cursor is on the function call.

Fixes: QTCREATORBUG-19394
Change-Id: I033e8774db93680bfc3ee52610b817e0ef8ccc76
Reviewed-by: David Schulz <david.schulz@qt.io>
2020-08-11 10:10:08 +00:00
Leena Miettinen
a85e5ce618 Doc: Update information about developing for Android devices
- Users can now add images to use as splash screens.
- Restructure the information to promote the automatic setup.
- Remove obsolete and duplicate information.
- Move external links to external-resources file.

Change-Id: I9578ff8615bb2a0db528f45276d16a838554b143
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-08-11 08:16:43 +00:00
David Schulz
5cd625babf Editor: update KSyntaxHighlighting lib to 5.73.0
Change-Id: Ic46cf24a6afd5cee28f4294dc67186ae0d24fbf0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2020-08-11 08:04:19 +00:00
Leena Miettinen
bd24903ddc Annotation Editor: Fix UI text capitalization
Change-Id: Ie6a62677b44cb8f4b158178252cc7a098734681e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-08-11 07:53:58 +00:00
Leena Miettinen
ed95b3e6a1 Doc: Add info about IncrediBuild plugin
Fixes: QTCREATORBUG-24217
Change-Id: I3e9023933db508f14139b719eae0191d4615eab7
Reviewed-by: hjk <hjk@qt.io>
2020-08-11 07:53:36 +00:00