aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
...
* | QmlDesigner: Replace alias icon with font iconHenning Gruendl2020-08-032-22/+87
| | | | | | | | | | | | Task-number: QDS-2559 Change-Id: Ibcc4c6565eff6a5c5f7011fbf39af2277da9eec0 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Dumper: Fix dumping of enum values for cdbChristian Stenger2020-07-311-2/+2
| | | | | | | | | | | | | | Fixes the Bitfields test. Change-Id: I2aab020f1dc8be40ab994586d0989452c80bb8e3 Reviewed-by: hjk <hjk@qt.io>
* | QmlDesigner: Move zoom buttons to FormEditorWidgetHenning Gruendl2020-07-102-21/+27
| | | | | | | | | | | | | | | | | | | | | | * Move the zoom all and zoom selection button to the FormEditorWidget taskbar * Add zoom in and zoom out actions/buttons * Fix ZoomAction in and out direction * Add update icon font Change-Id: I9addba5652cafa5884450bc633a1e16087aae8dd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add change type name dialogHenning Gruendl2020-07-102-1/+10
| | | | | | | | | | | | | | | | | | | | * Add a change type name dialog showing all incompatible properties * Fix ExpressionTextField triggering twice on pressing enter * Fix compare operator Task-number: QDS-1946 Change-Id: Ic384f6dcce44297b43839c17874108b39af909da Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Controls 1 cleanupHenning Gruendl2020-07-1028-807/+836
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace ScrollView Controls 1 with ScrollView Controls 2 * Replace TabView with TabBar and StackLayout * Remove unused styles * Replace Controls 1 imports * Remove print statement in FontSection * Fix layout width by correcting CheckBox width * Remove TabView from QtObjectPane Task-number: QDS-2454 Task-number: QDS-2455 Task-number: QDS-2456 Change-Id: I913d326afb012375dd5b804171cb8cd67681514c Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Clang: Fix error when including float.h with mingwChristian Kandeler2020-07-091-0/+34
| | | | | | | | | | | | | | | | | | | | | | Prevent mingw from trying to #include_next a private header from a path we cannot add to our list of includes. Fixes: QTCREATORBUG-24251 Task-number: QTCREATORBUG-24027 Change-Id: I18a9db130b9c2265cd208c3506d08d2e1c4cee45 Reviewed-by: Marco Bubke <marco.bubke@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | German translation: Avoid ambiguous shortcut overloadRobert Loehning2020-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | D clashes with "Datei". E clashes with "Erstellen". B clashes with "Bearbeiten". U clashes with "Auswahl in Kleinschreibung wandeln". G clashes with git shortcuts Change-Id: I2d13eb45f73847526b896420510bdba196949787 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | C++: Fix highlighting Q_PROPERTY with template typesChristian Kandeler2020-07-082-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We override the Q_PROPERTY macro in our own header. This appears to have two effects: 1) The macro arguments are properly highlighted. 2) There is no completion from libclang for Q_PROPERTY, meaning our own helpful snippet is the only completion candidate. I don't understand the reason for either of these; they seem to be more or less random effects of parsing peculiarities. As it turns out, our macro redefinition breaks if the type of the property is based on a template class, leading to false errors in the code model. Removing our macro redefinition fixes the code model, but also removes the aforementioned effects. Turning the macro into a variadic macro fixes the code model and keeps effect 1), but not effect 2). Therefore, we also update the snippet to provide an extra string that makes it clear this it's a helpful snippt, rather than just a normal completion. Fixes: QTCREATORBUG-24243 Change-Id: I4044d5e633af3ebdba36032d5efd3333b5a36214 Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlDesigner: Fix spinbox empty value handlingMiikka Heikkinen2020-07-081-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Force zero value when text value converts to NaN. Also, onEditingFinished doesn't trigger if value is something not accepted by the validator (the empty value), so do the equivalent also on focus loss, if value is still dirty (meaning onEditingFinished didn't happen). This ensures we're never left with different value shown and written in qml file. Change-Id: I3862d8d11adf7955f99b50b515e015ad132a5c78 Fixes: QDS-1539 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.12' into 4.13Eike Ziller2020-07-061-15/+19
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/lldbbridge.py Change-Id: Ia444f6424fb35b9a539e157afcee868161535272
| * | Fix debugging C++ on iOS devicesEike Ziller2020-07-061-20/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert 7f958700a09f09ac124b20d23236ede472b58d87 for 'remote-ios'. The original commit changed the way attaching to a remote server or process works, attempting to make it work with lldb-server on a remote linux device. That breaks connecting to the debugging server on iOS devices. Fixes: QTCREATORBUG-23995 Change-Id: I7a793fa73a564a4ef19cf82e13c2ad50d4247ee3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | QmlDesigner: Remove Controls 1 dependenciesThomas Hartmann2020-07-065-60/+44
| | | | | | | | | | | | | | | | | | Change-Id: I085d24265669c55777e0c63b5f6fb26a8d0fe631 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Git: Port colorful log to text colorsAndre Hartmann2020-07-0611-36/+26
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTCREATORBUG-24198 Change-Id: Icde06da5ac848fb0f7faf02a8e55fb26136f318c Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: André Hartmann <aha_1980@gmx.de>
* | | Dumper: Adapt to Id that moved from Core to UtilsOrgad Shaneh2020-07-062-3/+6
| | | | | | | | | | | | | | | Change-Id: I6437d813234dc22923a313d540f115e070edeba7 Reviewed-by: David Schulz <david.schulz@qt.io>
* | | QmlDesigner: Remove ExtendedFunctionButtonThomas Hartmann2020-07-062-240/+0
| | | | | | | | | | | | | | | | | | Change-Id: Ia8b7933ccb9b33d5d09b2a7edd862937246d97d8 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | QmlDesigner: Remove custom controls 1 stylesThomas Hartmann2020-07-064-217/+0
| | | | | | | | | | | | | | | | | | Change-Id: I695813e7b97caf7355211550856e51a398566ae9 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | QmlDesigner: Remove GroupBoxThomas Hartmann2020-07-062-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is unused. Change-Id: If128fe35d6dd925cd4ff4999b2050e61325230da Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | QmlDesigner: Allow starting free drag on initial selection pressMiikka Heikkinen2020-07-037-4/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed object selection to be done on press instead of click, and the initial press now also starts free drag of the selected object after a short distance moved to prevent accidental drags. Change-Id: I61656661cd734d167ef9f8db42d986f0e97402a3 Fixes: QDS-2376 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | | Debugger: Respect "Use Dynamic Object Type for Display"Orgad Shaneh2020-07-032-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | Broke in 5efa84830bb41bfc11db9295df3ad34f5b9bd9f5. Task-number: QTCREATORBUG-24280 Change-Id: Ice4b9d826d2402efb354180886d35926a2513e5a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | Wizards: Improve python class wizardChristian Stenger2020-07-022-33/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some minor fixes, simplifications and improvements. In detail: * create valid Python code * allow creating a Python class also without a Qt package * hint about the need for a Qt package depending on the base class * remove QDeclarativeItem as base class as this is not present in recent Qt packages Change-Id: I7198f315b3a9eec9a04f52d7438d05ccce40c3f7 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* | | Android: update to latest SDK cmdline-toolsAssam Boudjelthia2020-07-011-7/+7
| | | | | | | | | | | | | | | | | | | | | Also, add the --sdk_root argument which is needed. Change-Id: I85f9444b35bb31aed9670bd322f2754061cf70c6 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | | Merge remote-tracking branch 'origin/4.13'Eike Ziller2020-07-0111-69/+56
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/android/androidsettingswidget.cpp Change-Id: Iadf1d58a1e867ae7bb2dca55d3951613cfcc3d07
| * | | Wizards: Update templates in regard to deprecation warningsChristian Kandeler2020-06-308-66/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QT_DEPRECATED_WARNINGS macro has no effect anymore, so let's remove it along with the huge chunk of comments that took up an inordinate amount of space in the resulting project file. The concise comment for the QT_DISABLE_DEPRECATED_BEFORE macro is perfectly sufficient. Fixes: QTCREATORBUG-24244 Change-Id: I549c16c2c037bb64c2833e4807047ab3a8b2103f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * | | QmlDesigner: Turn the 3D edit light on initially for lightless scenesMiikka Heikkinen2020-06-291-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib840adec751604f08b5135b3e3088b7ce663685a Fixes: QDS-2316 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * | | QmlDesigner: Handle active scene id change properly on edit 3D viewMiikka Heikkinen2020-06-292-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scene id shown on the corner of edit 3D view is updated and toolstates are also stored under the new id. Change-Id: Ib3ac2f2bb829a5d908e22932c313c76bd4143592 Fixes: QDS-2277 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * | | QmlDesigner: Update 3D edit view on state changeMiikka Heikkinen2020-06-292-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I56b16afe4d9ccab802d6e07f60b57e46a353cc26 Fixes: QDS-2378 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | | | QmlDesigner: Property Editor cleanupHenning Gruendl2020-06-292-306/+339
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Put align distribute section in separate file Change-Id: I8f0219f32f847c11733833164c5287af5df429cd Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | | QmlDesigner: Set height according to active tabHenning Gruendl2020-06-291-15/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | * Add binding to current tab height * Remove unused specficsOneHeight statement Task-number: QDS-2051 Change-Id: Ia1ac6af4e65d3de5e1db96f2bcc2d1ec8eb08312 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/4.13'"The Qt Project2020-06-299-26/+52
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/4.13'Eike Ziller2020-06-299-26/+52
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Ie67085fcbb4150c60f0253312e19a82b95b4a898
| | * \ \ Merge "Merge remote-tracking branch 'origin/qds-1.59' into 4.13" into 4.13The Qt Project2020-06-296-24/+48
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'origin/qds-1.59' into 4.13Tim Jenssen2020-06-266-24/+48
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/clangformat/clangformatplugin.cpp src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp src/plugins/qmldesigner/qmldesigner.qbs Change-Id: Ie4a0beeb9fd32ac9683f4e8769988a9c3f3e369a
| | | | * | QmlDesigner: Fix crash on puppetThomas Hartmann2020-06-261-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I233d3dab5a509bfd7c9a30c7dcc15dcf8751f456 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | | | * | qmlpuppet: improve textTim Jenssen2020-06-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd1b7cd783561bc0b1e853e8875ee631eddb85d6 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| | | | * | qmldesigner: add language to create scene commandTim Jenssen2020-06-115-23/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and also save the last used language to settings Task-number: QDS-2218 Change-Id: Ib82f7bc755755661183452b32829be3d048d9947 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
| | * | | | QmlDesigner: Fix draggable priorities in 3D edit gizmosMiikka Heikkinen2020-06-263-2/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upped default priority of all directional draggables a bit to make them preferable to free rotation ball. Change-Id: If934cb723e8c1a8ca9a114d71b19cbfc196e2682 Fixes: QDS-2286 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | / / / Wizards: Update CMakeLists.txt files to handle Qt 6 and Qt 5Tobias Hunger2020-06-294-14/+21
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update wizards to produce CMakeLists.txt files that can work with both Qt 5 and Qt 6. Bump minimum CMake version to 3.14 since that is the first version that accepts Qt with major version 6 in AUTOMOC/AUTOUIC. Task-number: QTCREATORBUG-24206 Change-Id: I2ff462e67f01d84939c02be579579f358bc0b20e Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | | | Debugger: Show text representation for 'char *' typedefs etcMichael Weghorn2020-06-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'tryPutSimpleFormattedPointer' takes care of nicely showing the actual string representation of character arrays if the innerType is one of 'char', 'signed char', unsigned char', 'CHAR'. To make this work for typedefs of those types as well, first resolve the typedef before passing the value to 'tryPutSimpleFormattedPointer' from 'putFormattedPointerX'. This e.g. improves the display of variables of type 'const gchar *'. Fixes: QTCREATORBUG-24264 Change-Id: I477b6d7552f9c30c12d819aa5f37e64e4f444969 Reviewed-by: hjk <hjk@qt.io>
* | | | Qmlpuppet: Remove an explicit bool type for fitAndHideBox() functionArtur Shepilko2020-06-262-12/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Explicit return values in qml functions cause errors in some Qt versions, so remove the need for it. Change-Id: Idd3035b19b56c25e94bc846c3de8f7aa5381e1eb Reviewed-by: Artur Shepilko <artur.shepilko@nomadbyte.com> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | | QmlDesigner: Reset focus also for objects not derived from ItemThomas Hartmann2020-06-261-0/+5
| | | | | | | | | | | | | | | | | | Task-number: QDS-2369 Change-Id: Ifa9ce163751bad0de09db5d35f77609210dd0ac5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | QmlPuppet: Fall back to pre-Qt5.2 for QVariant comparisonhjk2020-06-261-1/+1
| | | | | | | | | | | | | | | Change-Id: Ibf55561e01f50ec7d689d40b50d100b8d257aa80 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | | QmlDesigner: Fix crash on puppetThomas Hartmann2020-06-251-4/+8
| | | | | | | | | | | | | | | Change-Id: I233d3dab5a509bfd7c9a30c7dcc15dcf8751f456 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/4.12'"The Qt Project2020-06-251-1/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-06-251-1/+1
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I4935b6afdb13627f32e850a4c8b536de0269bc4b
| | * | German translation: Avoid ambiguous shortcut overloadRobert Loehning2020-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | D clashes with "Datei". E clashes with "Erstellen". B clashes with "Bearbeiten". U clashes with "Auswahl in Kleinschreibung wandeln". Change-Id: I2ef93837fda1ba6e05d6dab2d6cc36fbddf23817 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | | QmlDesigner: Improve usage of QML items as quick3d texturesMiikka Heikkinen2020-06-2510-1/+200
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quick3D Texture elements require some window signals to show QML item as texture, so we fake them to make textures appear in form editor and state preview. To prevent texture mirroring, flipV value is force set at proxy creation. To keep state preview up to date, we trigger multiple render passes if there are any QML items used as texture sources in quick3D textures. Task-number: QDS-2290 Change-Id: I16c34aad943213c0b737fdb073333be3bbd40f2d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | | Icons cleanup: Remove unused icons and deduplicate identical pngsAlessandro Portale2020-06-223-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Accordingly Adjust the svg element Ids to new png locations in the source tree. Change-Id: I717dd7165c571e69322a1cce8d609f49c6bc75bc Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | | Debugger: Make QByteArray, QString and QList dumper work with Qt devhjk2020-06-181-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this is more a temporary workaround as there are more changes to come (qsizetype instead of int for sizes, switch QList/QVector aliasing). Task-number: QTCREATORBUG-23806 Change-Id: Ic815fe293b1c4922276c127dec61930dc365acae Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | qmlpuppet: Fix function linkageChristian Kandeler2020-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Putting static functions into a header file causes warnings in all cpp files that include the header and don't use the function. Change-Id: I9147c034092515e486dc6113a1b053f4d8094686 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | | Merge remote-tracking branch 'origin/4.12'Eike Ziller2020-06-152-16/+230
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/cmakeprojectmanager/fileapiparser.cpp Change-Id: I39f8c2be859be043f506bef77de9bb5b42d38165
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 14:05:22 +0000