Commit Graph

47434 Commits

Author SHA1 Message Date
Christian Kandeler
1e9c42d76b ProjectExplorer: Do not cut off the "file extension"
... when constructing a run configuration display name.
The target name is not typically a file name and might legitimately
contain a dot.

Fixes: QTCREATORBUG-25480
Change-Id: I7954763661d36ae20b931d6d05ef3e29b36a9fc9
Reviewed-by: hjk <hjk@qt.io>
2021-04-01 15:08:54 +00:00
Thomas Hartmann
405cf39ee0 QmlDesigner: Fix auto generated sheets
Section does not have padding properties.

Change-Id: I1a527d1ea168ec7ca7eb354b99fee879950270e7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-04-01 14:21:41 +00:00
hjk
c24291648b Meson: Aspectify general settings
This follows suit which what is currently happening in other plugins.

Change-Id: I5fb75e23d7d6add632cd07c732131b4f9793d345
Reviewed-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-01 12:11:17 +00:00
hjk
0c5036e307 Conan: Move closer to now-default settings construction
Change-Id: I04078070de9831c1de94d400a7723f4efe0e0a8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-01 11:53:38 +00:00
hjk
283ef97384 Nim: Aspectify NimSettings
Change-Id: I3954bec762fb3f5d3426663108ff493f140f1b5e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
2021-04-01 10:25:48 +00:00
hjk
19d078bb5c FakeVim: Use new IOptionsPage convenience functions
Change-Id: I739fe152a4f642a19c90be71bbe5adbc8747f402
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-04-01 07:44:22 +00:00
hjk
adad221aa2 Git: Fix a condition
A 'true || ...' was used while testing aa69415ac7 and was accidentally
committed.

Change-Id: I07d56035e93944e20cf1d2f5808ce3cbff1c5d5e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2021-04-01 07:13:45 +00:00
Tim Jenssen
2fc05c056f studiowelcome: fix crashpad awareness
Splashscreen shows some information text
if that define is set.

Change-Id: I272eb470b8c2493577a50451a3c11832254b16b8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-04-01 04:36:40 +00:00
Mahmoud Badri
392c466b20 QmlDesigner: Fix used imports not working correctly
The existing logic (in qmljsinterpreter.cpp) for updating used imports doesn't work correctly. It takes into consideration items that are not
part of the currently open document. Fixed by checking current model
items in the document and updating used imports based on it.

Fixes: QDS-3785
Change-Id: Ia50c3c7e7ca41b9bca0d69e7c2e253f29892933e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-31 18:14:22 +00:00
hjk
ed2fba8f58 Docker: Simplify DockerOptionsPage setup
Change-Id: Id850de98968c7cb80c813a6fa8cd48543de24fd6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-31 15:44:46 +00:00
Cristian Adam
ca430f2a8b CMakePM: Copy the header file name to clipboard after adding class
Fixes: QTCREATORBUG-25212
Fixes: QTCREATORBUG-24301
Change-Id: Idf6104548223f6d26820bc395ee60c1a8c794c6d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-31 14:39:10 +00:00
hjk
cbc26f5dce AutoTest: Aspectify CatchTest settingspage
Change-Id: I281891fecdcd97e4ec450a795d51981cfb47ef69
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-31 12:10:45 +00:00
hjk
e87e70dcf6 QmakeProjectManager: Fix settings default value
Amends b569258748. The change dropped the special setup of
m_warnAgainstUnalignedBuildDir and fumbled when flipping the
the internal value for m_ignoreSystemFunction/m_runSystemFunction.

Almost back to the first patch: Keep the value under the name (and meaning)
"RunSystemFunction", but flip it for internal storage and user display.

Change-Id: I4e8cf430fd9ad922357b581b862b7e491c035977
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-03-31 12:05:36 +00:00
hjk
1d04466628 Autotest: Use LayoutBuilder for QtTestSettingsPage
Change-Id: I6f454bedbe0f1d2b9a1a14c146e35bcf41752533
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-31 11:56:36 +00:00
hjk
4cc6fef901 Utils: Merge BaseAspects and AspectContainer
They were quite similar, largest difference was the ownership of
subaspects, which is now handled by a bool property.

Change-Id: Ib3f2f20b9a84ef40ea8a9eb59da9c89c9a281750
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-03-31 11:56:04 +00:00
hjk
d8770be95e ProjectExplorer: Aspectify Default Build Properties page
Change-Id: I3341ced5597f5b891b66da77e074fdf3217327ea
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2021-03-31 10:06:04 +00:00
Christiaan Janssen
5dcf2ba0fa McuSupport: manage kits for different SDK versions side-by-side
Task-number: QTCREATORBUG-25044
Change-Id: I6fbadd1e4192e9958ec4bb1a5bbbfe82c168fc2d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-31 07:30:08 +00:00
hjk
a202301918 Autotest: Partially aspectify autotest settings
This only handles the storage side, all gui/layouting is left for
follow-up changes.

Change-Id: I0f2b6dc82e5d4374528c8a72610a5afe264a72b1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-03-31 07:29:24 +00:00
Christian Stenger
f98510960e QmlDesigner: Fix missing include
Amends bd9a61fa27.

Change-Id: I890c0766931064f665aee9b6a705d4d7ce9a1e71
Reviewed-by: hjk <hjk@qt.io>
2021-03-31 07:13:17 +00:00
Alessandro Portale
105d65b19c WebAssembly: Always use system environment to run em++ -dumpversion
On Windows, we would start with a clean environment just with the emsdk
environment added in order to run "em++.bat -dumpversion".

That fails for some emsdk versions for reasons unknown. Let's reduce OS-
specific special casing and instead use the system environment as basis
everywhere.

Change-Id: I143fe6193528390e17ee0a62936ad03d2c5a109e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-03-30 13:59:03 +00:00
Christian Kandeler
392d9038f8 QmlDesigner: Fix qbs build
Change-Id: I7dbbf49d96e80deab2e7ce002fb1ac08f7548228
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-30 11:14:44 +00:00
Aleksei German
d815751824 QmlDesigner: Fix for Form Editor color roles
Change-Id: I429842fa875c89201aa7f273a35d3e7dde4666ed
Fixes: QDS-4062
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-30 10:14:50 +00:00
Thomas Hartmann
a1ce4c9bc7 QmlDesigner: Fix crash
Change-Id: Ia96a163efb6a612861d5cc90e37a121fcb3db646
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-30 09:54:04 +00:00
hjk
341132dd0a CMake: Code cosmetics
- use newer approach to settings page layout building
- no SHOUTING enums
- namespaces
- proper dialog parent for message

Change-Id: I7adfb7487d502b8fd706c4a0c5645f4d2153e39c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-03-30 08:57:31 +00:00
Aleksei German
0768ec8687 QmlDesigner: Fix for color roles
Change-Id: I6336130d7db684a13081e5a128753816bf5bbcc5
Fixes: QDS-4038
Fixes: QDS-4039
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-29 14:18:42 +00:00
Tim Jenssen
dc2710cd00 crashpad: fix windows builds + show settings checkbox
coreplugin/CMakeLists.txt uses BUILD_WITH_CRASHPAD and not
the old not existing variables

Change-Id: I5ad9ebb3cf0ac1ee06d53a1e276d70a194b0ace4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-03-29 12:25:41 +00:00
Allan Sandfeld Jensen
9a5d04f4fa Fix qmake build
Change-Id: I5730de131f90c198bdf14b6983a4dbc0efbdcea5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-03-29 06:32:20 +00:00
hjk
bff4022e98 CodePaster: Some more settings page cleanup
Change-Id: Ieac61eda5081025a3fe3cbbfffbd46d5433d0ebc
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-29 05:25:38 +00:00
Cristian Adam
a862c7b354 CMakePM: Fix "Build type" for multi configuration generators
The multi configuration generators (Visual Studio, Xcode) had an
empty "Build type" which caused failures to parse the CMake file-api
information.

Change-Id: I70ee4978cee4d43e980edf4cd512d1ca95275638
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-26 19:36:19 +00:00
Alessandro Portale
4465e60afd QMakeProjectManager: Restore original settings defaults
The new default "true" for "Ignore qmake's system() function when
parsing a project" broke initial parsing of an opened qmake project.

Task-number: QTCREATORBUG-25536
Change-Id: Ia155e27051a030b5fbf34ab3b94d7be2b952eb9b
Reviewed-by: hjk <hjk@qt.io>
2021-03-26 19:08:29 +00:00
Thomas Hartmann
254365b7d6 StudioWelcome: Set correct file for Digital Cluster
Change-Id: Idf8513a7db3c7e096c814395ffa701689e1cc0cf
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-26 17:15:05 +00:00
Thomas Hartmann
ee281240eb StudioWelcome: Fix crash
Check if a project does actually exist.

Task-number: QDS-3309
Change-Id: I59beff2637bbe80175dd223d6f574ea3886d95c5
Reviewed-by: Aleksei German <aleksei.german@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-26 17:14:56 +00:00
Thomas Hartmann
981e3e734f StudioWelcome: Add effect demo ad download
Change-Id: I95346189de1a6915f8b971cd2c9f69a027f63f6a
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-26 17:14:45 +00:00
Alessandro Portale
07f1aa7ed1 CMakeProjectManager: Remove left-over qDebug()
...from CMakeBuildSystem::updateQmlJSCodeModel

Change-Id: I2f0db764266d5580c47fb99bc6637bcd0ba508ca
Reviewed-by: hjk <hjk@qt.io>
2021-03-26 15:19:25 +00:00
Michael Winkelmann
5fa2911c63 Editor Proxy: Fix warnings and code style
Change-Id: I978aef31f7c09da33509dddd2a13ae138551c914
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-26 14:58:12 +00:00
hjk
5a9b715fed Android: Robustify aspect access by id
Warn, instead of crash in case the aspect implementation changes.

Change-Id: If74cb91395e317765d493a97dcd1cdecc6f94296
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-26 13:45:02 +00:00
hjk
beda749326 CMake: Aspectify CMakeSpecificSettings
Change-Id: I2e094c5a392964fdaf49ac30c2e0ae0f57a3b11d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-03-26 12:40:08 +00:00
Marco Bubke
7785a3a651 Sqlite: Move result count to class declaration
It move the magic number of column results to the sql statement
and improves the mock a little bit.

Change-Id: I101067444cf27ec5dea0c72de7fd484a7e8710f0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-26 12:24:37 +00:00
Alessandro Portale
a25ea9febe Android/iOS: Don't add markup to display names of build steps
The display name is continuously read and written from/to settings.
Let's not add markup each occurrence, it accumulates.

BuildStep::summaryText has the logic to add the markup for the UI.

Change-Id: Ifbb74ccb8d2f0adcebbd69cc012a5b1376154934
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2021-03-26 11:21:36 +00:00
Eike Ziller
eb516063d3 Fix build with Qt 6
Change-Id: I546dd9457e68b9ff59b0fe50248553736d18729b
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-26 10:48:11 +00:00
hjk
daf19fec84 Core: IOptionsPage code cosmetics
Header sorting, common pattern for namespaces.

Change-Id: I22b37faad459083ee87acb83ece80c7ac9f404e9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-26 10:43:45 +00:00
Jarek Kobus
d3faab0e72 StringTable: Use QElapsedTimer instead of QTime
Change-Id: I75065cbe32dcd4405360b90f3f51387f286d6186
Reviewed-by: hjk <hjk@qt.io>
2021-03-26 10:31:28 +00:00
Tasuku Suzuki
2ea13a359a QbsProjectManager: Fix context menu grouping warning
3bd490acdb introduced a warning
Can't find group "ProjectExplorer.Group.Build" in container
"Project.Menu.Project"

Change-Id: I1a382f7e807b79a938ec70fd3b1b0a27d54c29f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-26 07:53:11 +00:00
hjk
23f6aea6d3 Android: Prevent crash in AndroidManager::applicationAbis
... in connection with CMakeBuildConfiguration initialization.

Having an Android device type does not necessarily mean an Android Qt
version is selected in an incomplete kit.

Change-Id: Ib157166c45b7d2ac20eafd6437054b9232595c1e
(cherry picked from commit fdd69e27b3)
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-03-26 07:52:40 +00:00
Vikas Pachdha
28de5ec4fd AssetExporter: Export type Label as text
Task-number: QDS-3979
Change-Id: I0920d242a480da9a27f26d39b44ab1d3714917e4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-03-26 07:31:46 +00:00
hjk
c38739df57 Debugger: Use new IOptionsPage apply convenience
Change-Id: I2954bec762fb3f5d3426663108ff493f140f1b5e
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-26 07:20:31 +00:00
hjk
1dba079cbd Python: Use LayoutBuilder in settings widgets
The removed margin around the subform at the bottom is intentional.

Change-Id: Ia598a6189111346b0f23f7aa4801ad0db1725fb9
Reviewed-by: David Schulz <david.schulz@qt.io>
2021-03-26 07:09:26 +00:00
Alessandro Portale
bc7d0561c3 Android: Simplify pre-/post-run adb command input
AdbCommandWidget is cumbersome to use and has issues regarding updating
the enabled state of the buttons and the dragging and dropping of items.

Cut the maintenance and replace AdbCommandWidget with a StringAspect,
where one line means one entry, just like several other places in Qt
Creator do.

Some residue remains though: in order to keep project settings
compatibility, we need to convert from QStringList (settings) to QString
(StringAspect) and back.

Change-Id: I3ebfff882358ba2e8c0ac6d5b309e89a84f0554c
Reviewed-by: hjk <hjk@qt.io>
2021-03-26 07:02:31 +00:00
hjk
fdd69e27b3 Android: Prevent crash in AndroidManager::applicationAbis
... in connection with CMakeBuildConfiguration initialization.

Having an Android device type does not necessarily mean an Android Qt
version is selected in an incomplete kit.

Change-Id: Ib157166c45b7d2ac20eafd6437054b9232595c1e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2021-03-26 06:58:36 +00:00
Tasuku Suzuki
c4b730b002 ResourceEditor: Set focus to the prefix line edit after creating new one
"Add Prefix" adds prefix /new/prefix%1 which should be updated by user most
likely.

Change-Id: I0978574b38eb74b39c1cc8377ef1ab9008a4d88e
Reviewed-by: hjk <hjk@qt.io>
2021-03-26 05:59:31 +00:00