Commit Graph

68568 Commits

Author SHA1 Message Date
Friedemann Kleint
cc92c5001b Brush up the Python wizard code templates
Fix the spacing and introduce pathlib.

Change-Id: I240291d91cae7c233b2d3ec5c0dfaeede09ad47d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
2021-03-23 11:58:56 +00:00
hjk
b2615c3f5e Utils: Set QLabel buddys for aspects
This lets us using & shortcut e.g. in settings pages.

Change-Id: If630ba221298374c9a59820e7955ded80b4166cc
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-23 11:12:36 +00:00
Eike Ziller
b71e673bf2 Improve description of "Link with Qt"
Make it clearer that this only affects that specific Qt Creator
installation.

Fixes: QTCREATORBUG-25500
Change-Id: Ia636e2f98b8042333ca12aaab0af58df42ba4727
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-03-23 11:08:47 +00:00
Cristian Adam
9d2fab7c17 CMakePM: Clear CMake configuration to remove backup files
Also remove the CMakeCache.txt.prev, .cmake/api/v1/reply, and
.cmake/api/v1/reply.prev which might cause problems in
case of CMake configuration failure.

Change-Id: I24f049e5e0338b78393b68ab3680276388ffc6bf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-23 10:51:11 +00:00
Christian Stenger
7d3a23a693 QmlJS: Fix compile for Qt5.14
Amends 5ad724a3ac.

Change-Id: Ie53a738b61e2de84083fc6c9d3422451df9358c6
Reviewed-by: Erik Verbruggen <erik.verbruggen@me.com>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-23 09:44:40 +00:00
hjk
5b13fb2168 QtQuickCompilerAspect: Use better connection guard object
The aspect may outlive its widgets.

Change-Id: I93d742e15277f64d1919739a2244736fb294e5b0
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-23 09:12:46 +00:00
David Schulz
2177eeb7cd Debugger: Fix QJSValue dumper for qt6
Change-Id: Id0a6796d3a4efca71a7f7474b2143281dc3322f0
Reviewed-by: hjk <hjk@qt.io>
2021-03-23 08:56:59 +00:00
David Schulz
4100b98d70 Debugger: Fix dumper tests for QVariant
Change-Id: I39953e14d3f1a15802b6acfc80a23005e304ee43
Reviewed-by: hjk <hjk@qt.io>
2021-03-23 08:56:46 +00:00
hjk
f28b0fe6a1 QtSupport: Use createSubWidget for Qml related aspects
Change-Id: I8ceb64cdd96abe241fd81b411200871e7d061a97
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-23 08:55:40 +00:00
Kai Köhne
4f8474e532 Simplify handling of qmlplugindump
Much of it isn't needed anymore:
- we do not build a debug version of qmlplugindump anymore since Qt 5.0
- on mac, qmlplugindump is not an app bundle since Qt 5.1
- since commit 6871f31b4e, the env parameter was just passed through

So if we take out this and all the infrastructure around it,
qmlplugindump is just a tool that we can handle like all the other
tools.

Change-Id: Ifa583ce7052a9030858312ab7c2e20f7ebce4051
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
2021-03-23 08:41:01 +00:00
Eike Ziller
072607962d Locator: Add longer description to filters
This is shown as tool tips in the location options, and if any platform
supports this also as tool tips on the menu actions of the locator input
field.

Change-Id: I8b439e45e6097a16a5f932d25d4e5d3e9bddb6ad
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-23 08:29:30 +00:00
Cristian Adam
bc518cf353 CMakePM: Disable Add and Batch Edit buttons when the file-api parsing failed
For a project that failed to generate a valid CMake file-api reply
the manual added variables could be lost when the new state doesn't
result in a valid CMake file-api reply.

The user will have to edit the initial CMake parameters to generate
a valid CMake file-api reply.

Task-number: QTCREATORBUG-24637
Change-Id: I091a301ceee3cd41ec59b6282bb9515a49c1a366
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-23 08:29:19 +00:00
Cristian Adam
1a4c7abb22 CMakePM: Keep CMakePM error messages meaningful
If CMake project parsing is failing for some reason, it's better
to keep the error message with the actual error than just replacing
it with "The project was not parsed successfully."

This error message was also issued when the project was loading,
which is a bit misleading.

In order to test this:
1. Set the build type to "" (nothing)
2. Clear CMake Configuration from menu
3. Run CMake

This will re-configure the project with initial cmake parameters,
but "-DCMAKE_BUILD_TYPE:STRING=" will set the build type to empty,
and CMakePM would try to parse 'Release' and issue:
"No 'Release' CMake configuration found".

The commit resets the error message when the project is loaded.

Change-Id: I1a586ec19f324d75a25e8f282cab02a6934fce2b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-23 08:25:37 +00:00
Mahmoud Badri
a52c2519e3 QmlDesigner: Fix import version when adding unimported module
Fixes: QDS-3994
Change-Id: If39df641cbfb563a169b3b2e8001f68941fd398c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-23 08:15:51 +00:00
Leena Miettinen
6c6aff772f Doc: Update info about positioning components
- Use "component" instead of "item" or "QML type"
- Add links to the new topics for Design views

Task-number: QDS-3778
Change-Id: I6ed1720ad587d014e8fe52792d4d3c4b9bf0b113
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-23 07:23:17 +00:00
David Schulz
30ec121654 Debugger: Fix QObject dynamic property dumper
Change-Id: I120161f65a180f6facec0a5def2414ff128b31f9
Reviewed-by: hjk <hjk@qt.io>
2021-03-23 06:20:57 +00:00
Christian Stenger
98ac237b7f Unittest: Rename test cases to reflect their content
Amends b746a3e562.

Change-Id: I96e37d31be7efc72533c767c882ffa62967e7a6c
Reviewed-by: Tom Praschan <tom@praschan.de>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2021-03-22 19:59:35 +00:00
Christian Stenger
eda5fbd645 QtSupport: Do not set visibility for items without parent
Avoids having the item popping up separately before adding it to
its respective parent.

Change-Id: I7e7d4765ebf8b1937f50670cbf04ab3bf6edbecd
Reviewed-by: hjk <hjk@qt.io>
2021-03-22 19:59:25 +00:00
Mahmoud Badri
c5b72d4d74 QmlDesigner: Rename "Import Module" to "Add Module"
...in the context menu for items in the "All Other Components" section.

Fixes: QDS-4009
Change-Id: I1e561d61f8580fdeb7828c438b9b23d92516efec
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 18:44:42 +00:00
Thomas Hartmann
7f05b7e918 StudioWelcome: Add new examples and tutorials to welcome page
Change-Id: I15c9323ada722b34197c544e785630d467177170
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 17:06:02 +00:00
Michael Winkelmann
0c7cb42e5f StatesEditorView: replace custom scope guard with qScopeGuard
Change-Id: I87379e50fb652ed27692f78470d9bf706d5abfe8
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 16:55:55 +00:00
Leena Miettinen
a10ee88437 Doc: Update info on component files and exporting components
- Rename "Qt Quick UI Forms" as "UI Files"
- Rename "Exporting QML" as "Exporting Components"

Task-number: QDS-3778
Change-Id: I8aa4afbb7391fe04dbcee8f68bcc6407a855b65a
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 16:42:14 +00:00
Eike Ziller
e9bf841dc9 Fix lupdate issues
Some wrong tr calls / missing tr functions.
Some places where we need to bring lupdate to the right track with
regard to namespace resolution.

Change-Id: Idf552054a34e24d9671db68c816bf37f4d403dbc
Reviewed-by: hjk <hjk@qt.io>
2021-03-22 15:00:37 +00:00
Marcel Krems
efa9d258a2 Pass the correct positions to clang-format
clang-format expects the position in bytes and not in characters.
This offsets the position the more non-latin1 characters the code contains.

Fixes: QTCREATORBUG-21812
Fixes: QTCREATORBUG-23131
Change-Id: I499c44c5364c0623ffba7cd35e6d18659c61d742
Reviewed-by: hjk <hjk@qt.io>
2021-03-22 13:35:34 +00:00
Cristian Adam
49a2e14357 CMakePM: Add "Re-configure with Initial Parameters" button
This makes it easier to configure a CMake project with initial cmake parameters
when parameters are added or if the configuration fails.

Task-number: QTCREATORBUG-24637
Change-Id: I880ac6ad82f7cc5e1df2e34e9bcc28e67c3d716e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-22 12:04:35 +00:00
The Qt Project
1bbcb89388 Merge "Merge remote-tracking branch 'origin/4.15'" 2021-03-22 09:56:01 +00:00
hjk
ce85282866 VcsBase: Remove VcsBaseClientSettings
It's replaced by VcsBaseSettings.

Change-Id: I60a0e4e267337f71e8a32b9b220565b765c973b1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-22 09:34:52 +00:00
Mahmoud Badri
e43a67447f QmlDesigner: Remove unnecessary method param
Introduced by d37f6648f3

Change-Id: Ib2f824c0a3755f4551b93f700bd0bb719a099003
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 09:24:36 +00:00
Mahmoud Badri
9e960d09a3 QmlDesigner: Correct item library spacings
Regression caused by db6ad528bb

Fixes: QDS-3855
Change-Id: I4a91a66fcfaf6cbd013bc54a65344cb7f3171798
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 09:22:51 +00:00
Eike Ziller
863260f1fd Merge remote-tracking branch 'origin/4.15'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/debugger/gdb/gdboptionspage.cpp

Change-Id: I4149e860b6842ea63bff3a7eb9632b7a6c2919d8
2021-03-22 09:52:14 +01:00
Marco Bubke
1ad6133161 Sqlite: Return auto instead of type to symplify test overload
Change-Id: I4b613a93f823f346021118eb532ae660295f3c6b
Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 08:34:50 +00:00
Marco Bubke
f777ab0f0a Sqlite: Add ReadWriteStatement alias to database
Change-Id: Ib5a7936d626cc147b7e1ac5973b42fa083b163ac
Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 08:34:44 +00:00
Marco Bubke
52143466a2 Sqlite: Prevent copying of LastChangedRowId
Change-Id: Ibed20ce8ee33a8f50756903f3133cb47cdfab218
Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 08:34:38 +00:00
Marco Bubke
baab71c073 Sqlite: Add busy handler
A busy handler is much more flexible than a timeout. In most cases we can
remove the busy exception handling code.

Change-Id: I59666ccfbd380a341412e3d25e6716b07097bf3c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 08:34:33 +00:00
Marco Bubke
a6cfbf82ac Sqlite: Update to version 3.35
Change-Id: Ie471a510529070850767058275446440b616cc4b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 08:34:27 +00:00
Marco Bubke
c2086e7854 QmlDesigner: Bump database version
Change-Id: I1342d85161e3d83de5411bd1a9ee97809b1ccfd7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-22 08:34:22 +00:00
The Qt Project
94bb3186f9 Merge "Merge remote-tracking branch 'origin/4.14' into 4.15" into 4.15 2021-03-22 08:25:05 +00:00
Kai Köhne
8d3563748a Make sure designer, linguist are also found in Qt 6 cross-builds
Do not try to locate designer and linguist via parsing mkspecs
anymore, since this won't work in a Qt 6 cross-build.

Instead, expect the binaries to be installed in QT_HOST_BINS.

Change-Id: Iab799770306e03e29f5f7afd2f92e824e66af25b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-03-22 08:24:46 +00:00
Eike Ziller
8a7b9fbdd4 Merge remote-tracking branch 'origin/4.14' into 4.15
Change-Id: I72ac4dab24021f0272a30400cc801387f0dcb558
2021-03-22 09:24:41 +01:00
Leena Miettinen
a76a3b38e8 Asset Import: Use double quotes for emphasis in UI text
Change-Id: Id9bdde4bcd1c0372f1d1e8ebc5accb75cda36af4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-22 08:14:46 +00:00
hjk
62974b0ad9 Subversion: Aspectify settings
Change-Id: I60a563511fce2e6487e8050541cedb086b0ab4e1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-22 06:42:08 +00:00
Andy Shaw
7ec825be5e Android: Ignore an error when doing an incremental build
Since this is not really an error but it is outputted to stderr,
we need to explicitly ignore it so it does not show an error
dialog.

Change-Id: Ia972cf134278216c317649b5483e3deac683374d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-03-20 09:29:27 +00:00
hjk
4a2a0f1037 Mercurial: Aspectify settings
Change-Id: I689ce9a52124043e07472a1c95a3672f856232c3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 14:20:26 +00:00
Kai Köhne
c5ecb47c61 QmlDesigner: Retrieve rcc command centrally
Change-Id: I6886a22b51a002b48c248b3f49adc622c58c7ad8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-19 14:17:15 +00:00
hjk
fb9796ae8a Bazaar: Aspectify settings
Change-Id: I0354698cf3473dd096e57481a945f0f59afc75b3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 14:08:42 +00:00
Aleksei German
3ad3f3ec16 Improve Qt Design Studio visibility in Qt Creator
Fixes: QDS-3765
Change-Id: I877da7c0caf153a48c17dbc9ced87ef54c1a082c
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-19 14:00:30 +00:00
hjk
78b4449692 CVS: Aspectify settings
Change-Id: Ib5170405b33b3e521470407065e85c95dad6163b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 14:00:00 +00:00
hjk
8d6cb35b74 Git: Remove note in settings dialog that does not apply anymore
Change-Id: I54e86ad419c09acc7ebd15bb4b2660d159c410f0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 13:51:27 +00:00
hjk
aa69415ac7 Git: Aspectify settings
Change-Id: I87dfeba360967cc77cc230811bcd9f67b3ea6e38
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-03-19 13:39:33 +00:00
Cristian Adam
637d45c66a CMakePM: Make "Build type" aspect visible
For single configuration projects if you change the build type
aspect you will change the CMAKE_BUILD_TYPE variable.

When switching the build directory the existing CMAKE_BUILD_TYPE
will be set as build type aspect.

Fixes: QTCREATORBUG-25451
Change-Id: I13519e95c316c556cc1348fba6121637d2fd4275
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-19 13:38:18 +00:00