Commit Graph

7806 Commits

Author SHA1 Message Date
Mahmoud Badri
ed21e25e14 CrashPad: Remove the 1 crash per hour limitation
Change-Id: Ie7634012f15059fd204cb03e37afd3d63d7bfb29
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 13:00:59 +00:00
Thomas Hartmann
a62aef2438 QmlDesigner: Set proper size if there is no project import
Change-Id: I29d8dbbac49c694439a600cfe393c6a475362714
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-23 12:39:49 +00:00
Henning Gruendl
872a93447b QmlDesigner: Update import version wizard qml.tpl
Change-Id: Ie1cdc6bd18cec1f6e0d1492033f43c23717d68a9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-22 16:47:13 +00:00
Thomas Hartmann
d913f5d886 QmlDesigner: Add comment to .ui.qml files
Add comment to the beginning of .ui.qml files that explains that
.ui.qml files are declarative.

Task-number: QDS-5964
Change-Id: Ie49bae33fb18ee42d4ab20986b72c2deadd5b734
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-22 16:11:11 +00:00
Thomas Hartmann
456a949244 QmlDesigner: Add comment to all .ui.qml files in wizards
Add comment to the beginning of .ui.qml files that explains that
.ui.qml files are declarative.

Task-number: QDS-5964
Change-Id: I040443b42a0e2907452d5b6d9d056746d3b75ff3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-22 16:09:30 +00:00
Thomas Hartmann
4cc94375d8 QmlDesigner: Rename custom className property to classNamePrivateInternal
This property is used for the class name, but "className" could be also
used by the actual application.

Task-number: QDS-6309
Change-Id: I752fafbcae434a8b2b96646e2473b6fedd93a160
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-22 15:26:19 +00:00
Henning Gruendl
e714b04242 QmlDesigner: Fix shift in component type TextField
Change-Id: I5dc4f7b0887405082456b511b57598e3e6e38ec0
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-22 14:08:19 +00:00
Henning Gruendl
08668e71da QmlDesigner: Disable fill type outside base state
Disable fill type ComboBox in ColorEditor when not in base state. Add
tool tip to make user aware.

Task-number: QDS-6184
Change-Id: Iee5644fff16fe93f2090e1cb117e96bb436fe1dd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-22 12:22:13 +00:00
Thomas Hartmann
3f078ee89d QmlDesigner: Add preview of pure 3D component in form editor
If the root node is a 3D node we show a preview similar to
the state preview in the form editor. The size of the preview
is hard coded as (640, 480).

Change-Id: If7f96522b093c17422fa38102bffe11ede016063
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-02-22 10:43:49 +00:00
Thomas Hartmann
3be545123a QmlDesigner: Add QMLSCENE_CORE_PROFILE for Qt 5
Task-number: QDS-5522
Change-Id: Iff3591e05a172716f3f37963e0430875e3ad9e04
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-21 13:22:14 +00:00
Thomas Hartmann
6104806208 QmlDesigner: Add new workspaces
Task-number: QDS-6234
Change-Id: I839459c18fd0937615d97c7b74584e97300b430b
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-02-21 11:32:26 +00:00
Alessandro Portale
a0d19e088e Wizards: Remove the .ui.qml wizard
Qt Creator does not offer editing .ui.qml documents, so it should not
produce them. For creating and editing .ui.qml, please use Qt Design
Studio.

Fixes: QTCREATORBUG-27085
Change-Id: I8bce9379a4bff8762a694067c25a0b266c41c417
Reviewed-by: Kimmo Leppälä <kimmo.leppala@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2022-02-18 15:55:22 +00:00
Thomas Hartmann
8538f919ca QmlDesigner: Adjust wizard template
Instead of using the constants we can use the size of the
main screen directly. This has the advantage that if
the size of the main screen changes without adjusting
the constants it still works.

Change-Id: I602cf4089249e90efb6a35b803d67df6ca2b1bab
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-18 10:59:07 +00:00
Leena Miettinen
1f3e6b4c7a Android: Fix punctuation and wording of messages
Task-number: QTCREATORBUG-27055
Change-Id: I4180717163ec52a405c40e1a932713dda27c3f38
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2022-02-18 07:27:41 +00:00
Mahmoud Badri
81c9051feb QmlDesigner: Fix rename asset folder dialog's error text width
Fixes: QDS-6202
Change-Id: Iea6714561ce23e3a18889ab5d684fbeae85d62fe
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-02-17 14:16:49 +00:00
Mahmoud Badri
9c4e4309f8 QmlDesigner: Close Assets Library context menu on press outside
Fixes: QDS-6197
Change-Id: I0c694b5a64bc0a41e905523b16552d6b0493eac6
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2022-02-17 13:57:52 +00:00
Leena Miettinen
1a90f06fe5 QML Designer: Fix UI text
Fix capitalization of strings and the wording of tooltips.

Task-number: QTCREATORBUG-27055
Change-Id: Id8e324b44574b9cf0d1522ae204b452cea6193cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
2022-02-17 12:05:26 +00:00
Christian Kandeler
120218e0fd Update qbs submodule
... to HEAD of 1.22 branch.

Change-Id: Ib15854a88b6265f341c42f2b62d67f914fb9e747
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-17 09:18:12 +00:00
Miikka Heikkinen
6173b78860 QmlDesigner: Allow going into component from item library
Added "Go into Component" to item library context menu for items that
have customComponentSource available. Doubleclicking on the item also
does the same.

Fixes: QDS-5786
Change-Id: I954bfb4864d74fa04b5da5b961f9aa2035132022
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-15 14:43:47 +00:00
Mahmoud Badri
d1fd23100a QmlDesigner: Fix assets library warning case
Fixed a warning that appears if the search moves from the
"no match found" case to a match case. Also added a small optimization
to searching.

Change-Id: I9e4759fe00959bcbe1a7018c1bdc6cc43069fca7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-14 17:12:33 +00:00
Christian Kandeler
b31a569b36 Project wizards: Use more recent default C++ standard version
Fixes: QTCREATORBUG-27045
Change-Id: Ia637c6f364d4f651c56f7ffab649fa8e62b5a2cb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-14 14:02:06 +00:00
Tim Jenssen
f9cceb6267 qds: remove redundant "QtStudio" feature
Nowadays, the decision which wizards will be shown are
done throw the StudioWelcome plugin if it is initialized or not.

Change-Id: Ief95fa8f813408522ac43c31dd6f4ffb069338d0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2022-02-14 10:33:26 +00:00
Christian Kandeler
fde7b90ee9 Fix some warnings
Change-Id: I2991f0ab84b26c93c0dbe2ec79f7638d299e3d39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 12:14:27 +00:00
Henning Gruendl
92c786d21e QmlDesigner: Add new color values
Add DSgreenLight, DSamberLight, DSredLight colors

Task-number: QDS-6174
Change-Id: I59e745aabc8b8182c36027f875af7709f8c62060
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-11 11:35:28 +00:00
Henning Gruendl
3688ee17fc QmlDesigner: Add new icons to icon font
Add downloadUnavailable, downloadUpdate, downloaded icons

Task-number: QDS-6174
Change-Id: I473cd786b3eb12aeb79b737141a7bb8da381e0e5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
2022-02-11 10:42:01 +00:00
Eike Ziller
b98de260e3 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: I61bc71d3a4e786b5392aed408f0efe4d28fe7e67
2022-02-11 10:49:15 +01:00
Thomas Hartmann
52e3f2cd5f QmlDesigner: Cache last image in 3D view and add busy indicator
This patch caches the last image from a document/model.
The result ist that when reopening a file in the 3D editor
the user sees immediately something.
Since the view is not interactive, yet, we show a busy indicator
until the view is fully initialized.

Change-Id: I26c8b0ea69f98ceb41580624c51d48d1e633ab80
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-10 21:00:11 +00:00
Miikka Heikkinen
f146b846cd QmlDesigner: Implement proper preview for pure 3D scenes
Refactored the existing 3D node preview generation to be done
synchronously, which enables their use also for creating state
and item library previews for 3D nodes with ease.

Fixes: QDS-5785
Change-Id: Ib493eccbc239f33bcad3301673a865494616a901
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-10 14:47:26 +00:00
Mahmoud Badri
9c5e6e2d8c QmlDesigner: Split components and assets libraries
Fixes: QDS-6151
Change-Id: Id6f79a2d1fcff5fb55d3ba3f1b1394f1f55ca36b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-08 17:09:40 +00:00
Xiaofeng Wang
0d17063e82 macOS: use string array to be compatible with both bash and zsh
By default, zsh does not split words in string by spaces.
See https://zsh.sourceforge.io/FAQ/zshfaq03.html

Change-Id: I167bae2af628be5b2fc9429a090628b6049f7ce4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-02-08 08:04:18 +00:00
Henning Gruendl
ac7ed5bebe QmlDesigner: Add switch to StudioControls
* Add switch control
* Add additional color to all themes

Task-number: QDS-6146
Change-Id: I75c8aa2dc0dd75cf5b3ac1e025b05ad5110d5b9e
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-07 09:24:53 +00:00
Janne Koskinen
53ed379314 Fix compilation after API change in QtDeclarative
Change-Id: Ibaeaa4b089a508b1cb44b5f90921675b49b3beb3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-07 06:26:47 +00:00
Alessandro Portale
08535a7e63 Make share/qtcreator/cplusplus/examples compilable
Builds now, but does not link (which is fine). And unrelated,
unintentional warnings were removed.

Change-Id: I6ece33933bc20e6e36fb3859de7c2b774b0e67d5
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-02-04 16:21:21 +00:00
Thomas Hartmann
0d812cd59b QmlDesigner: Update wizard templates
These are the latest changes from qtquickdesigner/6.0 branch.
Since 7.0 these templates are now part of qt-creator.

Change-Id: I533c005734518eaf7dcd94f3f94167d973af68a5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-04 09:29:40 +00:00
Christian Kandeler
b243a8d728 Wizards: Modernize qbs project templates
Change-Id: Ib6f6315f9730425d4fd3b566f66ed26aa1718695
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-02-03 15:40:33 +00:00
Mahmoud Badri
10fe71546c QmlDesigner: Implement renaming assets folders
Fixes: QDS-6123
Change-Id: I1923f78fe2a6739f1cf32fd86c0919965190d8ca
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-02-03 10:58:29 +00:00
Alessandro Portale
ccafc11fa6 Utils: Remove unused theme role TextColorHighlight
TextColorHighlight is a harsh "egineer red" #ff0000 in all themes except
one, where it is grey. Actually, TextColorHighlight was used in one
place, which now instead uses TextColorError.

Change-Id: Idcd61637edaa045fc718cf35a9d34ff1d5a64dad
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2022-02-02 21:19:03 +00:00
Eike Ziller
1368111824 Merge remote-tracking branch 'origin/6.0' into 7.0
Change-Id: Ie2b23daa457c2aed635a784963bc1e95740bd076
2022-02-02 10:17:03 +01:00
Eike Ziller
1221552377 Require CMake 3.16 and remove workarounds
CMake 3.16 is available on the major Linux distributions nowadays,
so we can get rid of some workarounds.

Change-Id: I32500375748f33c3e40fbd7a08824d823f817a8f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2022-02-02 08:55:31 +00:00
Assam Boudjelthia
4a228ab764 Android: Update Default Ndk version, build-tools, platforms versions
NDK r22b is used in Qt 6 and on 5.15.9 onward. Also update the
build-tools and platforms to a more recent version.

Change-Id: Ia9829def010047af528ce704f769a40910093fba
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-02-01 09:10:49 +00:00
Alessandro Portale
e58f50df2a Android: Remove html code from tr-strings in keystore creation dialog
This change removes markup with its unthemed color values from
translatable strings. Terminates error messages with a ".". Adjusts the
message strings in the .ts files, accordingly.

The error label is changed from QLabel to Utils::InfoLabel.

Change-Id: Ifdd65de8d9e0ae311b494e70b9dc77ca0a3e4f46
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2022-01-31 21:45:28 +00:00
Christian Strømme
4a0c6f1e78 Fix invalid usage of temporary data
Make sure the return value stays valid in the scope we're using it in.

Change-Id: Ifa8a7ef88c9189ba90f5adb699b284f381a59488
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-31 16:04:12 +00:00
Mahmoud Badri
25fa5540ea QmlDesigner: Implement adding and removing asset folders
Also corrected assets view margins and few relevants tweaks.

Task-number: QDS-5795
Change-Id: Ieeb68584bcb261422f48ec1a865f510a00c251f5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-31 14:57:22 +00:00
Miikka Heikkinen
01f33fe4f1 QmlDesigner: Enable MSAA on edit3D view
Change-Id: I792156d08378d025cb9dae9f3a8cb00439198a6d
Reviewed-by: Jarko Vihriala <jarko.vihriala@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-31 14:09:45 +00:00
Miikka Heikkinen
d48a4bd60f QmlDesigner: Add 3D editor visibility toggle actions
Added toggle for showing selection boxes, camera frustums, and icon
gizmos.

Fixes: QDS-5954
Change-Id: I97e12a3a04b9a1a1af5851e382f36c58ee869f45
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-31 09:15:32 +00:00
hjk
f529ec492c Debugger: Add dumper for qdump__boost__container__devector
From https://lists.qt-project.org/pipermail/qt-creator/2021-August/008922.html

Change-Id: I85fff706e7f90a8182a434316fed4b6a43958af6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2022-01-31 07:48:06 +00:00
Mahmoud Badri
d5eab11359 QmlDesigner/StateEditor: Improve adding new states
- Added a big add button at the end of the states list.
- Small add states button jumps in (bottom right) when the big button
is out of the view.
- View scrolls to the end when a new slide is added.

Task-number: QDS-5973
Change-Id: Ida96bd663cc0caf32889638fbf4ac9f617916368
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-28 14:35:17 +00:00
Mahmoud Badri
0d3ef2489d QmlDesigner: Add some states view improvements
- Added a gray border around unselected states.
- States resize to fit view height.
- States are centered vertically in the view.
- Removed collapse option, auto collapse when space is small.
- scroll bar always at the bottom.
- Overshoot list ends.
- Added margins around the states.
- Add states button: make it small and docked to the bottom right.
- Add states button doesnt take space from the view.

Change-Id: I4fc96f4341a6e4a0c70509240b7aed9c7890ec4d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-28 14:29:41 +00:00
Miikka Heikkinen
3ac3b61727 QmlDesigner: Ifdef nanotrace.h out if nanotrace lib is not included
Nanotrace headers are not exported to build dir at all if the feature
is disabled, so runtime puppet build can't find them. We have to
ifdef out the header include and define the required macros as empty
in puppet.

Fixes: QDS-6107
Change-Id: I702c3ed5521d30ee0b253d035dea4ea00d00848f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
2022-01-28 14:03:26 +00:00
Thomas Hartmann
6073f3396c QmlDesigner: Disable crashpad in the qml2puppet
If the host proecess crashes then qml2puppet will also be shutdown.
I suspect this can lead to crash reports of the host application
not properly reported.

Change-Id: Ic503874ce660db3311958ecd0718255a1cf3daea
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2022-01-28 12:39:10 +00:00