Commit Graph

22 Commits

Author SHA1 Message Date
Tim Jenßen
feabda3aa7 Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
  src/plugins/qmldesigner/CMakeLists.txt
  src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp

Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
2023-03-26 16:26:18 +02:00
Pranta Dastider
6016ef8bd8 QmlDesigner: Update Tooltips for Rectangle Section
This patch update tooltip text for Rectangle fields
in Property editor.

Fixes: QDS-9002
Change-Id: I23a9456bb7f4555b42d6a0b6fb5ea8f2d7ddb2cb
Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2023-02-06 11:48:37 +00:00
Kai Köhne
4e9c1d126c Replace GPL-3.0 with GPL-3.0-only
GPL-3.0 is deprecated by SPDX.

Change done by

 find . -type f -exec perl -pi -e 's/LicenseRef-Qt-Commercial OR GPL-3.0(?!-)/LicenseRef-Qt-Commercial OR GPL-3.0-only/g' {} \;

Change-Id: If316a498e3f27d2030b86d4e7743b3237ce09939
Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-01-10 08:05:04 +00:00
Lucie Gérard
a7956df3ca Use SPDX license identifiers
Replace the current license disclaimer in files by
a SPDX-License-Identifier.

Task-number: QTBUG-67283
Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-26 12:27:18 +00:00
Henning Gruendl
55082986e1 QmlDesigner: Introduce blocked state for labels
* Create blocked states for PropertyLabel, ControlLabel and
  MultiIconLabel
* Rename and cleanup the MCU blocked state properties
* Add missing MCU related control blocked states
* Remove majorQtQuickVersion usage
* Add context for the translator
* Fix a nested SecondColumnLayout
* Add missing property control in Column- and RowLayout
* Remove comments from EditableListView

Task-number: QDS-4692
Change-Id: Icb93fe153241f015ced54409a953a3318c7763ae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2021-07-14 08:03:15 +00:00
Henning Gruendl
9895cd5df8 QmlDesigner: Fix minor property editor issues
* Remove minorQtQuickVersion
* Add missing PageIndicatorSpecifics.qml
* Fix label text in RectangleSpecifics

Change-Id: I3dc49c893a204416b742ae603ce2834b061db4d6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2021-06-24 16:09:31 +00:00
Henning Gruendl
66cd1a41c9 QmlDesigner: PropertyEditor redesign
* Add responsive resizing for property editor width
* Adapt custom component templates
* Fix custom component template generation if no properties defined
* Adapt Animation specifics and sections
* Adapt HelperWidgets specifics and sections
* Update ColorEditor and its components
* Remove SimpleColorPalette and its components
* Add ColorPaletteSingleton
* Implement eye dropper for ColorEditor
* Add TextExtrasSection and FontExtrasSection
* Move Component section to a new file
* Remove Advanced tab make its content a section
* Redesign TabBar and TabButton
* Make QtQuick.Controls 2 specifics part of QtCreator repository for now
* Update import versions
* Add new constants
* Update icon font
* Fix/update StudioControls and HelperWidgets
* Fix a few undefined warnings

Task-number: QDS-4582
Task-number: QDS-4562
Task-number: QDS-4555
Task-number: QDS-4554
Task-number: QDS-4553
Task-number: QDS-4299
Task-number: QDS-4296
Task-number: QDS-3769
Change-Id: Ia9677fd97f26e0e31a45da7a4136db1c9e1a5bf2
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2021-06-22 14:08:30 +00:00
Henning Gruendl
15db0bb173 QmlDesigner: Rework SpinBox dragging functionality
* Replace DragHandler with MouseArea due to the DragHandler not being
  able to accept MouseEvents
* Replace TapHandler with MouseArea due to MouseArea stealing press
  signals from TapHandler, but needed to get press events due to
  removal of DragHandler
* Add functionality to keep cursor in place while dragging
* Keep ActionIndicator visible while dragging
* Fix qsTr in RectangleSpecifics

Change-Id: I6558623287e1864359128d4194c9db78736ee3a4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-10-26 10:37:47 +00:00
Aleksei German
7d21caabdb QmlDesigner: Minor Fixes for QDS MCU compatibility
Change-Id: I401ecf9ce12d7020e78a5449b321fb7927caffed
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-09-19 10:54:29 +00:00
Thomas Hartmann
7a7ee71f22 QmlDesigner: Do not support rectangle gradient in Qt for MCUs
Change-Id: Ida324bf0647234a0ecff6689265767c0925d9115
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-03-30 10:02:04 +00:00
Thomas Hartmann
620e17cf7b QmlDesigner: Implement usage of qtForMCUs property
If qtForMCUs is set in the qmlproject file we disable unsupported
properties like roation, transformOrigin or layer.

Change-Id: I75d9677beca3d4ce71f975b4f0ae75e63967d143
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2020-02-28 15:27:36 +00:00
Thomas Hartmann
029884c80e QmlDesigner: Use studio controls for property editor
* CheckBox
 * ComboBox
 * LineEdit

Adjusting some details in property editor.

Change-Id: I8f9d6ef87c187f5a3be7c5fb368a1813e6dba92c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2019-06-05 14:58:54 +00:00
Tobias Hunger
38cce7eb83 Update License according to agreement with Free Qt Foundation
* Update all files in share folder

Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-19 16:05:29 +00:00
Alessandro Portale
374f84acc7 Qt Quick Designer: License change to Qt Commercial + GPLv3
Change-Id: I7f7aecd02892b6c616cd148fa5d845e7bc0d3b4f
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-18 12:12:57 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Thomas Hartmann
83378d2af3 QmlDesigner: Fix typo
Change-Id: I36c8393ace088d7702d1771e806e1e420eb8bd95
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-08-27 10:15:06 +02:00
Thomas Hartmann
49d2450c01 QmlDesigner.PropertyEditor: Set a proper maximum value for radius
Task-number: QTCREATORBUG-12574
Change-Id: I5be4fb1e0004a9f1ab32d9b83e2048031cfb3eb6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-30 11:48:42 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Thomas Hartmann
7849a363ff QmlDesigner.PropertyEditor: adding missing qsTr()
Change-Id: Ifcda7118cce9858af4670d60d902868c9e45e90a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-08 17:21:51 +02:00
Thomas Hartmann
a2511021c2 QmlDesigner.PropertyEditor: fix color editing in RectangleSpecifics
Change-Id: I9c504f708e0d52fce2cb7c6fa3fe1b021c257435
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-20 17:54:53 +02:00
Thomas Hartmann
ec436a6d64 QmlDesigner.PropertyEditor: initial prototype for QtQuick 2
Change-Id: I85eac02934cd5f7f2f4664b9642c55bb3a23aa1e
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-09-17 10:15:46 +02:00