summaryrefslogtreecommitdiff
path: root/src/plugins/qmldesigner
Commit message (Collapse)AuthorAgeFilesLines
...
* | QmlDesigner: Rename QmlTimelineMutator to QmlTimelineThomas Hartmann2018-04-1011-55/+55
| | | | | | | | | | Change-Id: I1375fae2a5f100afe59d641cbe58d2fc4fd462a6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Rename KeyframeMutator to TimelineThomas Hartmann2018-04-101-1/+1
| | | | | | | | | | Change-Id: I00f524de5ad5ce4afaeb4d0a8c4e895247291bdc Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: remove testing codeTim Jenssen2018-04-101-3/+0
| | | | | | | | | | Change-Id: Idd5670fa0600e4d8d2cf66a03e67bb06a362001f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | widget as a std::unique_ptr is badTim Jenssen2018-04-102-3/+4
| | | | | | | | | | | | | | | | | | | | - a widget is often used as a raw pointer and in most cases the parent will take care of destructing it - here the context is also destructing the widget - so move back to QPointer and keep deleting to the context Change-Id: Ief5c4faa08d5e76f723b35d33d09fafc502c2d8a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Change description of custom local componentsThomas Hartmann2018-04-102-2/+2
| | | | | | | | | | Change-Id: I07589f105adf572b05f73bd7f39603612ad49b2f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix black barThomas Hartmann2018-04-101-1/+1
| | | | | | | | | | | | | | The color was not renamed in this inline css. Change-Id: Ib23977fcc9f3c5925ef5183dba0fc2c0216ab465 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Utils: Purge qtcfallthrough.hOrgad Shaneh2018-04-091-1/+0
| | | | | | | | | | | | | | No longer needed. Change-Id: I9b0bee014df89d4c567f1d2431b5ff9404f5f925 Reviewed-by: hjk <hjk@qt.io>
* | QmlDesigner: Remove magic opacity when adding items in statesThomas Hartmann2018-04-051-10/+0
| | | | | | | | | | | | | | It should not make a difference if an item is created in a state. Change-Id: I788cb2aec758a42418a5939c2430074803a662db Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Remove programmatical derivation of theme colorsAlessandro Portale2018-04-058-82/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | The Qt Quick Designer synthesized a few theme colors from existing theme colors. That was in order to prevent the need for 6 theme colors being defined in every theme. It turned out, however, that being able to define these if favorable. Todo in follow-up commit: remove QmlDesigner::Theme::qmlDesigner...() functions, and fix up the qml, accordingly. Change-Id: Ica85df5472cd7b9da8bf215eb6dbdcf608a4fb2d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | qmldesigner: avoid reloading document when not neededMarco Benelli2018-04-052-19/+35
| | | | | | | | | | | | | | | | | | Creating a new ReadingContext is an expensive operation as it creates and call a Link object. This operation is needed only when the document is actually changed, in all the other cases it is not needed. Change-Id: Ia368122d60d2c7de86d10e169dd7f20a19f01115 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Disable widgets while text is edited manuallyThomas Hartmann2018-04-052-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | While the user is editing text in the text editor we disable the input widgets. This ensures that the rewriter is not confused by the manual editing and also there is no guarantee that the QML code is syntacially correct. We also disable the toolbar. Change-Id: If062b49f834e901a933a9b1f67582ee9be6232bc Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | qmljs: remove remaining references to QtQuick1Marco Benelli2018-04-032-8/+3
| | | | | | | | | | | | | | | | This patch removes all references to QtQuick1 in qml library, plugin, designer, profiler and tests. Change-Id: Ie286fad96060299caae3ef328330597cf53e90d3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-311-1/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri Change-Id: I3b2d81462b2dfb9753863c87c79ffbbf8d536aac
| * QmlDesigner: fix crash on exitTim Jenssen2018-03-281-1/+3
| | | | | | | | | | Change-Id: I2e72699dd3f49c917a28d724753e27701a930fac Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Fix that menus didn't show ampersands in files namesEike Ziller2018-03-261-2/+3
| | | | | | | | | | | | | | | | | | | | And instead interpreted the ampersand + following character as an accelerator key. Task-number: QTCREATORBUG-17817 Change-Id: I327239499ce56e75fd12f2df5be60d4b04913acd Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | QmlDesigner: Fix compilation before it breakshjk2018-03-192-0/+3
| | | | | | | | | | | | | | | | Make #includes self-contained, anticipating breakage in the upcoming removal of projectexplorer/runconfiguration.h in qmakeproject.h Change-Id: Ia166ccb3c830c3cc6f50181690ba281d4a705de8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-161-4/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/android/androiddeployqtstep.cpp src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp src/plugins/qmakeprojectmanager/wizards/testwizard.cpp src/plugins/qtsupport/exampleslistmodel.cpp src/plugins/qtsupport/gettingstartedwelcomepage.cpp Change-Id: I126823f5f60613509520c07f52be7bc9d4f4367c
| * QmlPuppet: enable reset the default puppet buttonTim Jenssen2018-03-151-4/+14
| | | | | | | | | | | | | | | | | | | | Also fix the logic that empty means that it should use the default fallback puppet. Task-number: QTCREATORBUG-19511 Change-Id: Ia36907523281386a1ed56362a76e37aaa9ee16b2 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-1312-13/+238
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/cmakeproject.h src/plugins/debugger/debuggerplugin.cpp src/plugins/ios/iosrunfactories.cpp src/plugins/nim/project/nimproject.h src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp src/plugins/qmlprojectmanager/qmlproject.h src/plugins/qnx/qnxrunconfigurationfactory.cpp src/plugins/qtsupport/exampleslistmodel.cpp src/plugins/winrt/winrtrunfactories.cpp Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539
| * QmlDesigner: void static -> static voidOrgad Shaneh2018-03-121-1/+1
| | | | | | | | | | | | | | That's the order everywhere in the codebase. Change-Id: I62e57f2ddddd6e4fac0dc26d81b05839cf80a9db Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * QmlDesigner: Fix compile for Qt5.6Christian Stenger2018-03-121-2/+2
| | | | | | | | | | Change-Id: I25cdf8874c03865400a3a1bc451c6c58e9294ab0 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * QmlDesigner: Add meta hint if item renders children directlyThomas Hartmann2018-03-093-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | In some cases items render their children directly using an effect. In this case we do not want to hide the children when calling refFromEffectItem(). If the hint takesOverRenderingOfChildren is set in the .metainfo hints for a parent item we forward a flag to the puppet and refFromEffectItem() is not hiding this item, Change-Id: I37a8c0ad8a15bc914c220e03b1b744779431d655 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * QmlDesigner: Define new possible enum scopesThomas Hartmann2018-03-091-1/+1
| | | | | | | | | | Change-Id: Ifb96706615be8cd5d7f588a83bdfe1cf31886bb5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * QmlDesigner: Fix compile before Qt5.10Christian Stenger2018-03-091-1/+1
| | | | | | | | | | | | | | | | QString::back() was introduced in Qt5.10. Beside this fix the signature change of void checkNode(). Change-Id: I4945e618274e1a67fc36d33e875c14284a4b160c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| * QmlDesigner: Fix buildChristian Kandeler2018-03-081-4/+4
| | | | | | | | | | | | | | | | | | Fixes an error and a warning, and removes a local inconsistency regarding "void static" vs "static void". Change-Id: I1685823162290cb7d5f2df9cef6e32928fbf0a32 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Allow annotations in commentsThomas Hartmann2018-03-084-2/+179
| | | | | | | | | | | | | | | | | | | | This patch allows to store the auxiliary data of model nodes as meta data in the QML file. The meta data is encoded in a comment at the end of the QML file. By default such meta data is attached to the clipboard. Change-Id: I794d2c1297d270c5c1099c6c1be98b6b7a7f650b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Remove duplicates from tag listThomas Hartmann2018-03-051-0/+1
| | | | | | | | | | Change-Id: I09f59b0be9edf58476ab14e2c5888c87a87738f5 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Fix crashThomas Hartmann2018-03-051-0/+3
| | | | | | | | | | Change-Id: I9ce5492c6c3c7da243ef9c1850b4a27762becb51 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Fix crashThomas Hartmann2018-03-051-1/+2
| | | | | | | | | | | | | | This did crash if the meta info is invalid. Change-Id: Idb560b570b7951c02a4165cc1936952478bd00d7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Don't translate default windowTitle again and againRobert Loehning2018-03-061-1/+1
| | | | | | | | | | Change-Id: I4b4ff16e02c517bcd5a7c5ae73f62dd2a5bcc7cc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | QmlDesigner: Fix warning about missing overrideTobias Hunger2018-03-051-1/+1
| | | | | | | | | | | | Change-Id: I6f81172abc4138509ca6277d2164b8f2a8316714 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-011-5/+5
|\ \ | |/ | | | | Change-Id: I63f8aebb201936f671b1486ff9420f67e5e3fafc
| * Move the nullptr check before the first access of the modelKnud Dollereder2018-02-231-5/+5
| | | | | | | | | | Change-Id: I2dc972379cac571aafedaa27cf659076d5e46126 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-02-235-3/+64
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/coreplugin/helpmanager.cpp Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8
| * QmlDesigner: Use Core::ICore::dialogParent() for dialogThomas Hartmann2018-02-191-1/+4
| | | | | | | | | | Change-Id: Ie06e8632ff091ee6cc14dacf242461ceca4eaf9c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * QmlDesigner: Add static helper functionsThomas Hartmann2018-02-132-0/+35
| | | | | | | | | | Change-Id: If89619a7fe75b09afa53e2b33464364deccfcaee Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Ensure the semantic info is not outdatedThomas Hartmann2018-02-131-1/+21
| | | | | | | | | | | | | | | | | | When reformating we have to ensure the semantic info is not outdated. If the semantic info is outdated we loose the latest changes. We had a similar bug in the QmlJSTextEditor. Change-Id: I38bb74c7db6d0449b692b3975d3e9eb89b7c3364 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * QmlDesigner: Fix clippingThomas Hartmann2018-02-131-1/+4
| | | | | | | | | | | | | | | | | | We can only use the slightly extended boundingRect, if the bounding rect is actually included in the clip region. the clip region is smaller if the parent item has clip enabled. Change-Id: Ia773f4402475ec984663af48cc1420a8840cc642 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Fix NavigationWidgetFactory retrievalhjk2018-02-221-3/+2
| | | | | | | | | | | | | | They aren't in the global object pool anymore. Change-Id: I4f0ae69ebabe33f0276dbfd7137a4f8adbaad489 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Remove funny, commented codeEike Ziller2018-02-201-16/+0
| | | | | | | | | | Change-Id: Id7203efe0c131ac049b3d238d674db1fede40c52 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-02-132-2/+18
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp Change-Id: I2445882a270731b866b04f28ff87d161224c539a
| * QmlDesigner: Allow priorities for resource handlersThomas Hartmann2018-02-092-2/+18
| | | | | | | | | | Change-Id: If9e9ad3ebc57ba2d80f3b1e89d0643223a00fe72 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | QmlDesigner: Avoid use of global object poolhjk2018-02-074-35/+25
| | | | | | | | | | | | | | Plus some code cosmetics. Change-Id: I6fde62da5a99e750131d20336d35565280ac7bef Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-02-077-19/+91
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/locator/locator.cpp src/plugins/imageviewer/imageviewerplugin.cpp src/plugins/remotelinux/remotelinuxplugin.cpp src/tools/clangbackend/source/tokeninfo.cpp tests/unit/unittest/data/highlightingmarks.cpp Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67
| * Qt Quick Designer: Fix typo and caps in UI textLeena Miettinen2018-02-061-2/+2
| | | | | | | | | | Change-Id: I759d7ceb319bb9b328a093118a9b5182d01dc6d7 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * QmlDesigner: Do not show Backends tab in stand alone modeThomas Hartmann2018-02-021-1/+9
| | | | | | | | | | Change-Id: I03b591b91b072282e5e69851b62a5623759d4456 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * Add project tab to navigatorThomas Hartmann2018-02-025-16/+80
| | | | | | | | | | | | | | | | This makes navigation the project a lot easier and the layout of the side bars can be locked. Change-Id: I3ad7b85cb8704aedf8f5ec9ea9b2930c5a0986d1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Core: make useMacShortcut constexprDavid Schulz2018-02-021-1/+1
| | | | | | | | | | Change-Id: I293b96428784b6efecac6dae4f2f9690af0027da Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-02-0126-23/+255
|\ \ | |/ | | | | | | | | | | | | Conflicts: share/qtcreator/qml-type-descriptions/qmlproject.qmltypes src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp Change-Id: I35fb652f29a98a798be7c8b4b4c2e581eb175fb6
| * QmlDesigner: Add keyframe support to property editorThomas Hartmann2018-01-317-0/+75
| | | | | | | | | | | | | | This patch allows to insert key frames if a timeline is present. Change-Id: I39c8281e5e559a838ad61939d3f2db7c6abcf76b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
View Lorry Controller Status