Commit Graph

68211 Commits

Author SHA1 Message Date
hjk
69a2204eb8 Simplify KitAspectWidget interface
Not really a widget anyways.

Change-Id: I404cef102d6a6f4d3bd60860fe2bf2d58e3ca365
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-08 09:44:25 +00:00
Miina Puuronen
24d88de228 QmlDesigner: Implement hiding component library categories
Task-number: QDS-3822
Change-Id: I4e22385497c4e58725b7f7a62a4e4351d0b78661
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-08 08:53:25 +00:00
Christian Kandeler
17e2a80e10 TextEditor: Prevent UI freeze when generating proposals
Our fuzzy matcher slows down terribly if the input string has long-ish
substrings that partially match the pattern. We therefore skip the fuzzy
matching for proposal generation if we detect that the operation takes
longer than expected.

Fixes: QTCREATORBUG-25419
Change-Id: I57e0a57c620f42b80a0b02a93ff91fd1d2a35e44
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-04-08 08:26:14 +00:00
hjk
fa2129f76b Utils: Add a SelectionAspect way to pass values to QComboBox::itemData
Change-Id: I428fbb5deb66163e7c0a7561eb44c315db1ed823
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-08 07:51:24 +00:00
Eike Ziller
d01c86d36d Fix label inconsistency in options
Fixes: QTCREATORBUG-25540
Change-Id: I9c710dce916569813347ca60d70a1a410f4f410b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-08 07:08:18 +00:00
David Schulz
dde3fa12ac Editor: Fix RTL move line up/down
Fixes: QTCREATORBUG-25515
Change-Id: I865592938ce0f6c36a9f783e9a379ce5e07d6b88
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-08 04:22:31 +00:00
Thomas Hartmann
68d6f6c21c StudioWelcome: Use the QSetting to disable UsageStatistics
Instead of enabling/disabling the plugin we use the existing setting.

Task-number: QDS-4128
Change-Id: Ibddf39b53aeac3741396c0329879ed1b29f8bf57
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-04-07 20:03:00 +00:00
Johanna Vanhatapio
7d03ffdc93 Doc: Add links to new videos
Fixes: QDS-3986
Change-Id: I259109d124eca7d825d8bd5f02698d90f546fff2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-07 14:51:43 +00:00
Christian Kandeler
49601e2acb Fix some warnings about unused variables
Change-Id: Ib23d45e3a3523014826a863601b2f7f57dcb8e40
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-07 14:16:34 +00:00
hjk
ff46422b3e Bazaar: Use the new AspectContainer::applied signal
Also, remove unused BazaarSettings::sameUserId()

Change-Id: Ie3e39f2dff506932a2b6ef0a3dbffae9e40db64c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-07 14:16:08 +00:00
hjk
1ba18b7f78 Mercurial: Use the new AspectContainer::applied signal
Change-Id: I5c3a60b316f74b4c1fd96d5ddd955f31f18d3010
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-07 14:15:59 +00:00
Michael Winkelmann
1741aa41c5 DefaultAnnotationsModel: Add missing break
Change-Id: Ic8545a2f57cd969c48b29023d35c11cf484a31e4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-07 13:14:58 +00:00
Tasuku Suzuki
ffd5fc055f Git: Improve technical term "Tarball" for archive
Retrieve filters' name and suffix from mime database in Utils

Change-Id: Ia48b44541d2104abb61dac27b9ce5820e341cbf6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
2021-04-07 12:58:26 +00:00
Thomas Hartmann
69344a53db QmlDesigner.FlowView: Update flow items in instancesCompleted
When a instances are completed we call updateGeometry on all
transitions to ensure the click region is correctly initialized.

Change-Id: I75e81c0010e952a7d0567b3396e95eb134bd86fc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-07 12:09:57 +00:00
Thomas Hartmann
526fe8bf0b QmlDesigner: Fix crash
The transition property can be empty.

Task-number: QDS-4082
Change-Id: Iaa38fbd865c88f11f195975e7f608952bbdae851
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-07 11:56:38 +00:00
Johanna Vanhatapio
c7fa8ba8f5 Doc: Update the Design Views topic
- Updated pictures
- Updated some info on the main toolbar actions based on the tooltips

Task-number: QDS-4007
Change-Id: I49ba9e281d1248dfca564698f8b0ca2bd381ffe1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-07 11:51:59 +00:00
Johanna Vanhatapio
4bf879a770 Doc: Update info on the Library view
Task-number: QDS-4007
Change-Id: I981dfa54b4497b0517f1348aff8cc2d992a2cb2a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2021-04-07 11:30:23 +00:00
Thomas Hartmann
0af187299a QmlDesigner: Allow imports without version
Change-Id: I67faea759f33d4e8467cf9c16ec2f82b339f0646
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-04-07 11:25:17 +00:00
David Schulz
d9cf979d6d LSP: fix MinGW build
Fixes: QTCREATORBUG-25544
Change-Id: I2380fd020bb117cdfbb043ced73b885400d26985
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-07 11:17:40 +00:00
Thomas Hartmann
e216a4edf4 QmlDesigner: Add more known enums
Change-Id: Ib5e7b724967480d2c8428bb0379dbbe67e0b6daa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-07 10:52:33 +00:00
Michael Winkelmann
f4df672935 DefaultAnnotationsModel: handle default case as string
Change-Id: I8a631f89f849b05c52e559b83ec63104156454df
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-07 10:52:01 +00:00
Matti Paaso
77d8a88a3e Add qt-creator module instructions
Task-number: COIN-491
Change-Id: I3d1b8663c2c2c8d151db2a6ab0faab2ab8669011
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-07 10:34:40 +00:00
Christian Kandeler
de072785cd ProjectExplorer: Make sure we always scroll to the new current item
... in the issues pane.
When fixing another issue, we accidentally lost auto-scrolling for cursor
key navigation.
Amends 74b773e68f.

Fixes: QTCREATORBUG-25432
Change-Id: I67f9a9b198276ce38a19862dc66000ced6a9a6fa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-07 10:02:36 +00:00
Leena Miettinen
8215518279 Doc: Describe opening terminal windows from Projects view context menu
Task-number: QTCREATORBUG-25162
Change-Id: I0f0939ce98c1de54577b4a67c9097bad9fafecf4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-07 09:24:49 +00:00
Cristian Adam
dbb5a70f93 CMakePM: Remove non existing targets from cmake --target list
Testing with a hello project like this:

1. Go to settings select "hello" target, deselect "all"
2. Go to CMakeLists.txt and rename the hello target to hello2
3. Run CMake <-- important, this will rescan the file-api target structure
4. Build

Step 3 will notice that hello target is missing and remove it, since
no targets are there "all" will be inserted and step 4 will work.

Fixes: QTCREATORBUG-25477
Change-Id: I6a4461341550931006558e5fdecb5a4323afaf35
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-07 09:04:14 +00:00
Christian Stenger
5d5ff57495 AutoTest: Fix gtest detection
If a test name starts with a number the codemodel handles
the function-like macro differently and does not generate
the arguments as it would do when using normal literals.
Work around by explicitly handling the expression tokens.

Fixes: QTCREATORBUG-25498
Change-Id: Ibf381af912403cb7b87c1c30b5a8fc7043c16056
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-07 08:58:14 +00:00
Sergey Levin
0c01ef9998 Expand RunControl displayName
Change-Id: I654ec71aeea945b59eb8a557254530dff97bed8c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-07 08:25:25 +00:00
David Schulz
ae85170b66 LanguageClient: untrack request on cancel
Now we search for the key twice in the hash, but the hash shouldn't get
to big and the lookup doesn't happen very often.

Change-Id: I4751a8203321bb4c1ea5092b89593971d736e034
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-07 06:17:05 +00:00
David Schulz
f13d402b31 LanguageClient: prevent multiple TextEditorWidget connections
Change-Id: I97c7cb00bad898cc5f698bd3dcee23e44acfa9e2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-07 06:16:38 +00:00
David Schulz
1e8879ee72 LanguageClient: track document highlight request based on widgets
We can have multiple widgets per document, so we can have multiple
different cursors for the same document. Tracking document highlights
per widget prevents cancelling a potentially valid request for another
text cursor of another widget.

Change-Id: I800d9be5b44b327351252ab90305b8882efa87bb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-07 06:16:33 +00:00
David Schulz
ccdd0d666d LanguageClient: Do not send hover requests to unreachable server
Change-Id: Icb4d3516a12b9475967de5ff5dcbf45cf5986195
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-07 05:18:32 +00:00
Thomas Hartmann
c7d9ca1154 QmlDesigner: Fix Qt 6 imports
This allows using a Qt 5 puppet with simple Qt 6 files.

Change-Id: Ic3264ffbf8d798ff260305079a0bb281f9628795
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-06 16:45:32 +00:00
Cristian Adam
85e2368b38 CMakePM: Reparse CMake project when the file-api json files change
CMake will reconfigure itself if you have modified the CMakeLists.txt
files. Qt Creator needs to reparse the file-api json structure even
if the "Auto-run CMake" is being disabled.

"Auto-run CMake" will run CMake when the project files themselves
have been changed e.g. modify and then save.

CMake will use ninja / make to reconfigure itself, generate the file-api
structure and Qt  Creator needs to keep up.

Change-Id: I12d8683b86f35bd6e0ebccec5300cd7ae8dce0b2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-06 15:46:07 +00:00
Eike Ziller
c0f1cd8e53 macOS: Show icons for device types in menu
When selecting a device icon for a kit, we should show the actual icons
in the menu even on macOS, even though icons in menus is not customary
there.

Task-number: QTCREATORBUG-25443
Change-Id: If0aed679b9cd3b1645bd423af70059730a522f05
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-04-06 13:48:49 +00:00
Thomas Hartmann
350d1cd090 QmlDesigner: Properly react to deleted properties in ConnectionView
If the property contained a node we reset the model.

Task-number: QTCREATORBUG-25437
Change-Id: If7efebed87fe2936069a06e2bd03193806427a97
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-06 13:29:51 +00:00
Thomas Hartmann
ce5445d113 QmlDesigner: Do not call allDirectSubNodes twice
Change-Id: I6ce2d620848ec184d96cdceb5c0bcf323a937551
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-04-06 13:29:37 +00:00
Thomas Hartmann
3d917a01cc QmlDesigner: Fix crash
This case should not happen and is handled in a separate patch,
but in case we miss another corner case this avoids the crash.

Task-number: QTCREATORBUG-25437
Change-Id: I370e3e0b6901d8cdd857714a0766f0f8442a3d66
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-04-06 13:29:10 +00:00
Eike Ziller
c0cfafdd3d Merge remote-tracking branch 'origin/4.15'
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp

Change-Id: I403b236c40d73a61ae22304e289e9d4374366395
2021-04-06 15:17:40 +02:00
Kai Köhne
aaa3fda1ad Adapt locations of rcc and uic for Qt 6.1
They are now found in libexec, not bin.

Task-number: QTBUG-88791
Change-Id: I34a13034833117f2360fdbbf41c54bbf2cfb55da
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-06 13:07:26 +00:00
Jarek Kobus
1c50f441a2 Update qlitehtml to the last state
Change-Id: If1c75de19e5b1efb83b62dc445104947c4becdc4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-06 12:58:57 +00:00
Christian Kandeler
a8d9fb0e6e Update qbs submodule
To HEAD of 1.19 branch.

Change-Id: Ic26d07818b5e37f6726b80d1790e06e240b4d4b5
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
2021-04-06 12:57:10 +00:00
Cristian Adam
3da99f7832 CMakePM: Filter out utility targets from target configuration list
In the build target list there is no reason to have <target>_autogen
or <target>_autogen_timestamps targets.

Also do not sort the target list, so that the special targets stay
at top (all, clean, install etc)

Change-Id: I3107150bb40d68cc95246d4d09abc300a6e3d3fc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-06 12:15:52 +00:00
Thomas Hartmann
94ad31be13 QmlDesigner: Add more info to the DebugView
Change-Id: I5d50fa19ed4993cb97992bad5d6068902e288a1c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-06 12:14:13 +00:00
Eike Ziller
2ce76937d4 macOS: Fix compile warning
warning: 'NSCompositeCopy' is deprecated: first deprecated in macOS
10.12 [-Wdeprecated-declarations]

Change-Id: I471b7156e3d3111fbffd6d7a1ff99e8e847af7fe
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 12:07:55 +00:00
hjk
ba06114afa Utils: Improve handling of BoolAspects used for checked QGroupBoxes
Make the group box a registered subwidget of the BoolAspect, so it
properly triggers the necessary behavior in BaseAspect::isDirty.

Change-Id: I9f6291d87ef7ce4067e0d235de8b5be24de79a93
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 11:28:08 +00:00
Eike Ziller
4b3a746332 CMake build: Fix remaining issues with Devel package
On Linux (and Windows) we should not create toplevel files (README.md
etc) or directories (doc/, scripts/ etc).

On macOS, move the whole Devel package contents into the app bundle,
because that is installed toplevel in the Qt installers, and we
shouldn't even create include/, lib/ or any other directory at the
toplevel at all.

Since the prefix path must now point to the Resources folder inside the
app bundle, adapt build_plugin.py to also accept --qtc-path pointing to
the app bundle (Qt Creator.app) itself, and also to the app bundles
parent directory. Adapt the Qt Creator plugin project template
similarly.

Task-number: QTCREATORBUG-25414
Fixes: QTCREATORBUG-25415
Change-Id: Ic756237fb920b54b1ec95d076649ad947b39a7e8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-06 10:59:27 +00:00
hjk
b63b84b83c AutoTest: Aspectify BoostTest settings page
Change-Id: I68e10a283fcd59f58c77301ef176b4347f68264a
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-06 09:51:56 +00:00
hjk
71d3b04406 CVS: Use the new AspectContainer::applied signal
Change-Id: Icd86026a22f730fb5c7a460d5b1e38c16c5768b9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-06 06:24:41 +00:00
hjk
2004399f38 Git: Use the new AspectContainer::applied signal
Change-Id: Ib40e206e84228e91e4816c5b91800a5611f441a1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-06 06:24:34 +00:00
hjk
6102405a06 Subversion: Use the new AspectContainer::applied signal
Change-Id: Ie16ed5afc59a2f98f0564b9956550cdd08fa4b09
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-06 06:24:28 +00:00