summaryrefslogtreecommitdiff
path: root/share/qtcreator/qml
Commit message (Collapse)AuthorAgeFilesLines
* QmlDesigner: Avoid puppet crashThomas Hartmann2019-02-151-2/+2
| | | | | | | | If the property is invalid the propertyTypeName is a nullptr. Calling strcmp on nullptr is undefined and can result in a nullptr access. Change-Id: I270091fa1d2635019ad2e41c4a5eab9985227dcf Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Fix gradients in Qt 5.12.1Thomas Hartmann2019-01-251-4/+14
| | | | | | | | | In Qt 5.12.1 gradient is a QJSValue. See commit 1771d298f33543a3fe47decfe0fff10609b01ab1 This patch adds QJSValue support. Change-Id: I1c37b82bf033c38646564d5453e297258dd4b056 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Crash fixThomas Hartmann2018-10-291-1/+4
| | | | | | | | | This is likely to fix a crash we could only reproduce with the Qt Design Studio release on one machine. Task-number: QDS-270 Change-Id: Idc33ba145169613b866903fa5e259f8cd6ec4ee8 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Fix frequent typoRobert Loehning2018-10-231-1/+1
| | | | | | | can not -> cannot Change-Id: Ie872ada1bc9b4ed64bffb667c2e44dbb13b4ad11 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* QmlDesigner: Call all Component complete handlersThomas Hartmann2018-10-183-1/+24
| | | | | | | | | | | | We have to ensure to properly call all Component complete handlers. A single component usually has QQmlComponentAttached objects, which we have to iterate over. Therefore emitComponentCompleteSignalForAttachedProperty() is not correct. Task-number: QDS-269 Change-Id: I4aed5d511f9f6e21f72efb955fc6db21b70e7c42 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: change the import path to QtQuick2 pathTim Jenssen2018-10-101-1/+1
| | | | | Change-Id: I8adb6fdd334647dd85a8a9f95738ac22fc690363 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Improve the quality of state thumbnailsAlessandro Portale2018-09-131-2/+4
| | | | | | | | The ImageProvider needs a correct sourceSize. And the puppet needs to consider the devicePixelRatio. Change-Id: I408f956fdb4adb23f272c879878e44e88ca76321 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix clazy warningThomas Hartmann2018-08-011-1/+1
| | | | | | | Use nullptr Change-Id: I787794c67e89af7bc7a2d82def580bea3c8f2653 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Fix typo in file nameChristian Kandeler2018-08-013-2/+2
| | | | | Change-Id: I06086caeaa2144e93203bc0cea902259be5d73c5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: ModernizeThomas Hartmann2018-08-0114-30/+33
| | | | | | | modernize-use-using Change-Id: Ia8eef3d97db7b99ec813a030e1f39ee492d6cf9a Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Keep Qt 3D scenes from crashingThomas Hartmann2018-07-314-0/+104
| | | | | | | | | | | If we do not set the source property of the Q3DSPresentationItem nothing is actually rendered. If a scene is rendered in the puppet we get an invalid OpenGL context when rendering in the qml2puppet. Change-Id: I74db0df7de759e830499967bc6985745be291856 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: ModernizeAlessandro Portale2018-07-2531-94/+39
| | | | | | | | | | | | modernize-use-auto modernize-use-nullptr modernize-use-override modernize-use-using modernize-use-default-member-init modernize-use-equals-default Change-Id: Ic42b5c59fed5a4a01853138542d8156471e86f58 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Revert "Windows: Match the name case of included files"Orgad Shaneh2018-07-192-2/+2
| | | | | | | | | It breaks cross-compilation on linux/mingw. This reverts commit 1c014ed3d9256df0330338b34f1c710efa962cf8. Change-Id: I3e8183ec318541a4393ad242eefbdeaa78b7be44 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Windows: Match the name case of included filesAlessandro Portale2018-07-122-2/+2
| | | | | | | | | | | Although Windows is case insensitive, and lower case always works, Clang complains: Lexical or Preprocessor Issue: warning: non-portable path to file '<FooBar.h>'; specified path differs in case from file name on disk Change-Id: I8f94e9fb62f6afec8aa6b9d08a7c78f6ba8a4435 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlPuppet: Use override consistentlyTobias Hunger2018-05-078-37/+37
| | | | | | | clang-tidy fixes from modernize-use-override check. Change-Id: Ia9785ef4d5d236d9740abec26359495eaea2fad1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-04-131-4/+4
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/settingsaccessor.cpp src/plugins/autotest/autotestplugin.cpp src/plugins/git/gitclient.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.h Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
| * QmlDesigner: Read contentItem after completingThomas Hartmann2018-04-051-4/+4
| | | | | | | | | | | | | | This avoids issues with deferred properties. Change-Id: Ie9cc0eaa3468bcb21e4817f8c5e3c1b97c8fc99c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Increase size of states editorThomas Hartmann2018-04-101-1/+1
| | | | | | | | | | Change-Id: I5541214ca8aa518a59d0fa6563e59f69f8048eda Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-137-12/+65
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix compileThomas Hartmann2018-03-091-1/+1
| | | | | | | | | | Change-Id: I0837b8830735f80dd98928769e603907226ab6e0 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * QmlDesigner: Add meta hint if item renders children directlyThomas Hartmann2018-03-097-12/+65
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-011-0/+3
|\ \ | |/ | | | | Change-Id: I63f8aebb201936f671b1486ff9420f67e5e3fafc
| * QmlDesigner: Fix crash in puppetThomas Hartmann2018-02-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The infinite recursion occurs because we call QFileInfo::exists() even if no change/fix is done, if a file in a resource if actually missing. If fileName != fixedPath the ":" prefix has been replaced by an absolute path and a new call to ::create will early reject. Typically the directories do not match, so nothing is replaced. This crashed without the fix. With the fix we will always remove the ":" prefix and therefore we do not try to handle the "fixed" case. Even, a broken path that contains multiple ":" we would only handle a finite number of times until all ":" are fixed. Change-Id: Ie13cedc1212bb58a16c61e0137128539d189269d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlPuppet: Remove unused static functionhjk2018-02-281-19/+0
|/ | | | | Change-Id: I8c439f87c30b4b4102f0839cc745120568e6f34f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Use file engine to resolve resources in puppetThomas Hartmann2018-02-141-1/+52
| | | | | | Task-number: QTCREATORBUG-19729 Change-Id: I1297180e29446429b949fc0bbc1b74055018bc28 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Avoid detachsThomas Hartmann2018-01-231-1/+1
| | | | | | | | | The non const overloads of first() and last() do detach if the reference count is higher than 1. Therefore we use constFirst() and constLast() instead. Change-Id: I737cfc428f1c21f16185b9b51175e181c0ec7068 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Avoid some unneeded QFileInfo constructionsEike Ziller2017-10-191-1/+1
| | | | | Change-Id: I0289c3187f07e26d05a7ca591cc8b12b767c3502 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlPuppet: Check return value of fstatRobert Loehning2017-09-261-2/+4
| | | | | | Change-Id: I2b7c04712a883455d8a5a0daa1225c2ef84a0748 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlPuppet: Modernize (nullptr and member initialization)Tobias Hunger2017-09-202-17/+8
| | | | | Change-Id: Ifac20a48df8702f9d31042eb8765cbaadb60b25b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix @NodeInstanceThomas Hartmann2017-09-201-1/+1
| | | | | | | With @NodeInstance we can override the value of any property. Change-Id: Ib64d8b6823b82f0a809092b2468c008d73a5525c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: fix uninitialzed value warningsTim Jenssen2017-09-192-6/+5
| | | | | | | Change-Id: Ieddd83953b2009656ceecea2f9fedecd54ac9ac8 Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Introduce Breakpad crash handlerMarco Bubke2017-07-252-6/+2
| | | | | | | | | | | | Google Breakpad (https://chromium.googlesource.com/breakpad/breakpad) is a widely used crash handler framework, e.g. by Mozilla and Chromium. It is providing a platform neutral solution to generate mini dumps, collect debug information and generate stack traces from those. Done-with: Orgad Shaneh <orgad.shaneh@audiocodes.com> Change-Id: I09382e7db0dc9e29b228e7b554fda7b6f5684349 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Remove QtQuick.Controls 1.0 dependcy from Window mockupThomas Hartmann2017-07-201-1/+0
| | | | | | | | It is not required and prevents the mockup from working if QQControls 1 are missing. Change-Id: Ib439bded6dce6b8e0d6f21e9b22f3dad2a6c0d3a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* fix property spellingTim Jenssen2017-07-171-3/+3
| | | | | Change-Id: I00f84ec8d2c83d7f3937d2e21a24e02ba28991b3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge remote-tracking branch 'origin/4.3' into 4.4Eike Ziller2017-07-122-0/+3
|\ | | | | | | Change-Id: Ifb1dcc847ba4b32a79b349955fad5207e402cb7b
| * Qmlpuppet: add missing includesMarco Benelli2017-07-102-0/+3
| | | | | | | | | | | | Task-number: QTCREATORBUG-18498 Change-Id: Ie40a066508bb52f53b8ad528f9d4cf6969fc0632 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Remove unused memberRobert Loehning2017-06-071-1/+0
| | | | | | | | | | Change-Id: I646ebaed1179fd679b67ec8c942d7b8a592e9900 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Replace SwipeView with StackLayoutThomas Hartmann2017-05-153-1/+43
| | | | | | | | | | | | | | | | | | In the designer we replace a SwipeView with a StackLayout. Form the perspektive of the designer they are the same and StackLayout is easier to handle. Change-Id: I308ec209024e22db9f56e363e27588a40283603c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-05-092-0/+7
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/debugger/cdb/cdbengine.cpp Change-Id: Ib9aeccc4162c43e9ee3d85847d96678045625dd0
| * QmlDesigner: Add flag to check for designerThomas Hartmann2017-05-042-0/+7
| | | | | | | | | | | | | | | | | | The property runningInDesigner can be checked to find out if a component is running in the designer. Change-Id: Ibf35daba4bb30c7d919b1ff149c92b348d7e8059 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QmlDesigner: use initilizer_lists for pairsTim Jenssen2017-04-282-2/+2
| | | | | | | | | | Change-Id: I3a1ef67d8af255604494695807331576540b8afa Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: improve fixResourcePath()Tim Jenssen2017-04-262-18/+27
| | | | | | | | | | Change-Id: I675dfe507dbe2989b0a015baf75d0423ba088993 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-04-215-5/+5
|\ \ | |/ | | | | Change-Id: I44511e06986b7df6007be7daf7051c895a10794b
| * Use qEnvironmentVariableIsEmpty or qEnvironmentVariableIsSet directlyMontel Laurent2017-04-195-5/+5
| | | | | | | | | | | | | | | | Change-Id: I4f2e61e4bade9e7b4518d144db8163e596ab6264 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* | Merge remote-tracking branch 'origin/4.3'Eike Ziller2017-04-193-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/plugins/genericprojectmanager/genericproject.cpp src/plugins/genericprojectmanager/genericproject.h src/plugins/genericprojectmanager/genericprojectnodes.cpp src/plugins/genericprojectmanager/genericprojectnodes.h Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
| * Use QFileInfo::exists(...) which is faster that QFileInfo(..).existsMontel Laurent2017-04-143-7/+7
| | | | | | | | | | Change-Id: I0d2e61d84c74e60ef4f54074a4ca00f2d0835562 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Cast enum to the an integer type before streaming out to QDataStreamThiago Macieira2017-04-051-2/+2
|/ | | | | | | | | We stream in as int or as qint32, so this is symmetric. Change-Id: Ic46ff326a6ba46bc877cfffd148325c21241f3b1 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: hjk <hjk@qt.io>
* QmlDesigner: Fix warningThomas Hartmann2017-03-231-1/+1
| | | | | Change-Id: Iff2c50439521e602bd2703716590a3e95c8ab2b1 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Unite the bounding rectangle with actual sizeThomas Hartmann2017-03-171-0/+2
| | | | | | | | This is required to correctly render text elements with padding, since the bounding rect seems incorrect. Change-Id: Ifcef2607089a7a2cec071814d5d87bd27da7ace3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add support for high dpi to form editor and puppetThomas Hartmann2017-03-131-1/+7
| | | | | | | | | | | | | We forward the device pixel ratio to the qml2puppet and render items in higher resolutions. We have to set the device pixel ratio on the pixmap manually, since it is not serialized. The option IgnoreDevicePixelRaio allows disabling high dpi awareness. Rendering in high dpi affects performance, but since we use shared memory this does not seem to be a serious issue. Change-Id: Ie9219b8fdb37841c24d4fb3f0ca259f0194ef65c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
View Lorry Controller Status