aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* More Utils::toSet/toListhjk2019-07-044-7/+20
| | | | | | | ... and unrelated cosmetic changes. Change-Id: I591b17fd5289831e701b683f8fb47816efd1fa67 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Wizards: Fix typo in Plain C++ wizardChristian Stenger2019-07-041-1/+1
| | | | | Change-Id: Ifbef31b7edded3f372debe3065fe4e9abc4e9455 Reviewed-by: David Schulz <david.schulz@qt.io>
* QmlDesigner: Consistently capizalize "Flickable"Robert Loehning2019-07-031-1/+1
| | | | | Change-Id: Ie291f5cd2b5091a885945d074c9ea08aa14d7f84 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix DoubleSpinBox in-/decrease issueHenning Gruendl2019-07-034-77/+61
| | | | | Change-Id: I072600fa8ca43828d6e03515af34caef6c8cefbe Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Hide the cursor when dragging in SpinBoxThomas Hartmann2019-07-031-0/+3
| | | | | Change-Id: I3900c510bc5510eaba51ea2ae8700aa9ca72f59a Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Increase size of SpinBox for FlickableThomas Hartmann2019-07-021-1/+1
| | | | | Change-Id: Ie1343d8cf0dbe41eefd2027a1daa0133cbd109c3 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Fix ListView property editor layoutThomas Hartmann2019-07-021-0/+2
| | | | | | | We have to use Layout.fillWidth consistently. Change-Id: I6052fb8c1a2b2cdc704bba70db1f2bf26730232f Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Hide label if text is emptyThomas Hartmann2019-07-021-0/+1
| | | | | | | Otherwise we get padding on the left. Change-Id: I62d78bf988cefe8c91f55268a71c70094f163d5d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Increase the compression timer for SpinBoxThomas Hartmann2019-07-021-1/+2
| | | | | Change-Id: I8fe7b2b3645d053255b2486e0584f7f16f77997c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Use new combobox for layout propertiesThomas Hartmann2019-07-021-29/+27
| | | | | Change-Id: I52e353011b290a59c66003db8b2becd4cd160820 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Improve custom property editor for URLThomas Hartmann2019-07-021-3/+2
| | | | | Change-Id: I1bf81df8df94bc7d1469b484f6a66f874887b214 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add editors for font, Text and RectangleThomas Hartmann2019-07-025-13/+220
| | | | | | | This requires adjustments of FontSection.qml. Change-Id: I60eb17c299c73da42726dead0d8713a91d4af932 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Extend support for custom property editorThomas Hartmann2019-07-021-0/+6
| | | | | | | | | | | * Allow custom '.' properties to show up in custom editor * Allow custom property editors to span multiple sections This allows us to support alias proprties to e.g. Text and Rectangle items. Change-Id: I7939a5cf5769387dbb3a27df0fd9e74c493a577c Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add RealSpinBox and refactor SpinBoxHenning Gruendl2019-07-0218-182/+975
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Transfer all changes which came up while Qt Creator integration * Refactor states by using dedicated edit property * Refactor alias properties * Set SpinBox slider indicator default to false * Add CheckBox tri-state * Fix Menu closePolicy * Remove some connections * Fix TranslationIndicator * Add new values and fix some missing scale factor multiplications * Add new icon font * Use MenuItem instead of Action for context menu due to shortcut issue * Add RealSpinBox due to the following bug QDS-806 * Refactor SpinBox with findings during RealSpiBox implementation * Fix SpinBoxIndicator enable/disable state * Fix RealSpinBoxIndicator enable/disable with a new property called realEnabled and synching between the actual property and the new one * Make RealSpinBoxIndicator increase/decrease on release * Add drag start/end signals * Fix indicator behavior exiting/entering while pressing (and holding) * Fix wheel and dragging step size for increase/decrease * Fix reset of step size for cursor keys * Fix press and hold timer * Set decimals 0 by default (int by default) * Replace SpinBox with RealSpinBox in HelperWidgets Change-Id: Ieda049595e6483b052fcdf4ca597f6af66e5f4dc Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Set property editor scale factor to 1.1Thomas Hartmann2019-07-021-1/+1
| | | | | | Change-Id: Ibf2db6490ec908d8a2952fa88ca42e7d4c049f3f Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Debugger: Fix QStandardItem dumper testDavid Schulz2019-07-021-1/+4
| | | | | Change-Id: Ic4b965da9589a7bade4f96226bff3bb14987602c Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Debugger: add dptr child to QDir for msvc targetsDavid Schulz2019-07-021-16/+16
| | | | | | | | Makes it possible to access the entry lists if these were populated by the code. Change-Id: I066824d2ce7f75a38d208155156c93d06458f8b3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Dumper: Fix std::map<K, V>::iterator dumperOrgad Shaneh2019-07-011-1/+2
| | | | | | | The iterator type is std::_Rb_tree_iterator<std::pair<K, V>> Change-Id: I0ed2f2e6955deb4b402277fe0f3eb32b6af2d477 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Wizards: Fix qbs project template for QtQuick appChristian Kandeler2019-06-271-1/+1
| | | | | Change-Id: Iffc9dad352d78f54557f45b36687c543935853dd Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Wizards: Fix regular expressionsChristian Stenger2019-06-275-7/+7
| | | | | | | | | | | | | | | | Although this is valid JavaScript matching the '.' is not working as expected. The directory always gets messed up by replacing the first character with a dash. Use an alternate regular expression and also ensure the replacement happens globally instead of once as we want to replace all dots by a dash. As at it fix handling of the file suffixes as well. Task-number: QTCREATORBUG-22625 Change-Id: Ide189fe50e29994abfb368e503050b9b413aba9f Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Pretty printers: Unify code for different allocatorsMichael Weghorn2019-06-261-42/+19
| | | | | | | | | | | | | | | | The code path for allocators other than 'std::allocator' does work for 'std::allocator' as well, so unify this. This also fixes the case of std containers when 'std::allocator' is used and the compiler flag '-D_GLIBCXX_DEBUG' in place which results in size assumptions that were made in the now dropped path to not be fulfilled, thus leading to an incorrect display. Fixes: QTCREATORBUG-22606 Change-Id: I2b6f8ac9933b210d26197975017292e2fc227541 Reviewed-by: hjk <hjk@qt.io>
* Merge remote-tracking branch 'origin/4.9' into 4.10v4.10.0-beta2Eike Ziller2019-06-261-3/+3
|\ | | | | | | Change-Id: I53ceb69b1558520e7d7b6db8b7ebdd5c1590e991
| * Small fixes in French translationRobert Loehning2019-06-241-3/+3
| | | | | | | | | | | | Change-Id: I86816eb8e1d0f7b439532b9196aa28a8119e5234 Fixes: QTCREATORBUG-22613 Reviewed-by: Jocelyn Turcotte <turcotte.j@gmail.com>
* | Fix std::basic_string printer with custom allocatorMichael Weghorn2019-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes expansion of 'std::basic_string' in the locals view when a custom allocator is used (which previously would result in "<not accessible>" being shown); for example, when expanding 's' at the breakpoint in the following example: #include <string> template<class T> class myallocator : public std::allocator<T> {}; int main() { std::basic_string<char, std::char_traits<char>, myallocator<char>> s("hello"); return 0; // break here and expand value of 's' in locals view } Change-Id: I0ca98de50d83a1f6e6f019acc37a1302a05fdba8 Reviewed-by: hjk <hjk@qt.io>
* | Fix std::vector<bool> printer with custom allocatorMichael Weghorn2019-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the std::vector<bool> pretty printer, which previously just showed "<not accessible>" for variable 'v' for the following sample code (with system GDB pretty printer disabled so that the custom pretty printers are used): #include <vector> template<class T> class myallocator : public std::allocator<T> { }; int main() { std::vector<bool, myallocator<bool>> v; v.push_back(true); return 0; // break here and check value of 'v' } Change-Id: Ia9883aa0b06a396cb3546ac2594a82c1b2062b80 Reviewed-by: hjk <hjk@qt.io>
* | gdbbridge: Convert children to gdb.ValueMichael Weghorn2019-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Dumper::fromNativeValue' expects an object of type 'gdb.Value'. However, the 'pretty_printer.children()' iterator may return values that first need to be converted to this, as documented for function 'pretty_printer.children' at [1]: > This method must return an object conforming to the Python iterator > protocol. Each item returned by the iterator must be a tuple holding two > elements. The first element is the “name” of the child; the second > element is the child’s value. The value can be any Python object which > is convertible to a GDB value. Therefore, explicitly convert the value to a GDB value first. This fixes the expansion of 'std::vector<bool>' when system GDB pretty printers are enabled which previously led to "<not accessible>" being shown e.g. for the following example (expand 'v' in the local variable view at the breakpoint): #include <vector> int main() { std::vector<bool> v; v.push_back(true); return 0; // insert breakpoint here } Side note: GCC's pretty printer for 'std::vector<bool>' previously returned either '0' or '1' for the element values, thus leading to the problem described above. With this patch in place, the elements are shown when the vector is expanded, but the shown type is 'long long' (since that's the type that GDB seems to automatically assign when constructing a 'gdb.Value' from these integers, at least with GDB 8.2.1 on amd64). This will work as expected ('bool' shown as type) from GCC commit [2] on ("Have std::vector printer's iterator return bool for vector<bool>"). [1] https://sourceware.org/gdb/onlinedocs/gdb/Pretty-Printing-API.html [2] https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=6c7d761a3f5fd7d19795d1d4b9b027a04b3fe88b Change-Id: I9047affa5b4369befd2e2386c8a6b04c66c4b632 Reviewed-by: hjk <hjk@qt.io>
* | QmlDesigner: List all fonts in projectThomas Hartmann2019-06-251-1/+31
| | | | | | | | | | | | | | | | | | We iterate all over all ttf and otf files that are found unter the project directory and show their name in the FontComboBox. Task-number: QDS-100 Change-Id: I45c4d512783d5ecc4a646860c08e6088bd712798 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Remove shortcuts from undo redo in controls 2Thomas Hartmann2019-06-201-4/+4
| | | | | | | | | | Change-Id: I39c5bec7000c3af6e849b9e797da5c2b1d19e683 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Remove shortcut from Controls2Thomas Hartmann2019-06-201-2/+2
| | | | | | | | | | Change-Id: I4ba9b6d2892ef277f7b56d710edb08a202a81ed6 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Add alias export to QtObjectThomas Hartmann2019-06-191-6/+15
| | | | | | | | | | Change-Id: If1a78463d4f1625105ab1fad7e179e645be08c9e Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Use MenuItem instead of ActionThomas Hartmann2019-06-191-5/+5
| | | | | | | | | | | | | | | | This avoids conflicts with shortcuts. Task-number: QDS-803 Change-Id: I9269729cf2cb4a6bba9493d768c595748af3392d Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Debugger: Improve QObject dumperhjk2019-06-181-2/+6
| | | | | | | | | | | | | | | | | | | | Don't use two lookups for parent types and act on known null pointers. While the machinery is robust enough to handle the result it's a needless deviation in regular code path. Change-Id: I6e50629cf554870a3ffb9f488f654e6ae557e5b3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Fix layout in templatesThomas Hartmann2019-06-122-14/+25
| | | | | | | | | | | | | | | | Because the templates did not use the pre-defined layout, the layout was bit broken. Change-Id: I3a11e78a8dd6ac81252fa51270de5d427e5de0c2 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Fix property editor template for colorsThomas Hartmann2019-06-122-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The color editor requires its own section. Therefore we mark the color type with 'separateSection'. For this to work we have to order all properties. The properties that require their own section do come first. The QML code generation became a bit more complicated, but having proper default sheets for colors should be worth it. Task-number: QDS-742 Change-Id: I1eee71aa05c66af4aaf53e0e8c5a3514a9ca6d92 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Disable horizontal scrollbar for property editorThomas Hartmann2019-06-121-0/+1
| | | | | | | | | | Change-Id: Id6b9dc66ca86f775c7d8fd8a5c847becb5cf96cb Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Use OpenGL 4.1 surface for puppetThomas Hartmann2019-06-121-0/+8
| | | | | | | | | | Change-Id: I520adbb54fc264e738ca5eb630f5cc7bc80ee4bd Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | CMake: Small clean-up of CMake WizardsCristian Adam2019-06-127-62/+89
| | | | | | | | | | | | | | | | | | | | * Updated CMake minimum version to 3.5 (Ubuntu LTS 16.04) * Lowercase commands * Used the target name instead of ${PROJECT_NAME}, which nobody uses in practice * No string quotes around the source filenames, which do not contain spaces Change-Id: Ide9b3eb85535213798c6c35e08624cae080ebd9d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | QmlDesigner: Reserve less space for labelThomas Hartmann2019-06-121-1/+1
| | | | | | | | | | | | | | | | We currently waste too much space for long label. Eliding works fine for long property names. Change-Id: I1fe2836e8c06cff93e2a48c6290265ab300e5321 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Slightly reduce size of the spin boxThomas Hartmann2019-06-121-1/+1
| | | | | | | | | | Change-Id: Ida09ddf17fcdc7000b03c6020334e30cfa7c74ee Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Wizards: Include namespace in header guards againChristian Kandeler2019-06-123-3/+3
| | | | | | | | | | | | | | | | This was broken in 63c339ffba while trying to fix a different bug. Fixes: QTCREATORBUG-18157 Change-Id: Iec7e14de257195ed9bb20314b8031d3ef59df2ae Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | QmlDesigner: Add more studio controlsHenning Gruendl2019-06-1218-154/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add alignment button rows with new controls * Add font style buttons with new controls * Add anchor button rows with new controls * Fix CheckBox error about undefined assignment * Add new colors in ColorLogic * Fix low contrast for edit mode text color ComboBox, SpinBox, LineEdit * Add new icon font * Fix TranslationIcon background color * Some minor import refactoring Change-Id: If014c3351fd33ccaf893a31033c893e13ee04821 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix delete shortcutThomas Hartmann2019-06-071-5/+5
| | | | | | | | | | | | | | | | QtQuick Controls 2 seem to define all shortcuts globally. Task-number: QDS-803 Change-Id: I6d29f659261c12bdd66473e2c680044b486891ec Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner ColorPalette StudioControls usageAleksei German2019-06-071-8/+3
| | | | | | | | | | Change-Id: Ia1c2daa693e9c2c2a2808cf6fab65a2b60014456 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner ColorButton Labels replacementAleksei German2019-06-071-5/+5
| | | | | | | | | | Change-Id: I2b0af3e1f77fda44d738202986071b9c8f50cb4f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner ColorEditor Labels replacementAleksei German2019-06-071-3/+6
| | | | | | | | | | Change-Id: Ic437540c8f5047f303b627dd9579e8eead3791e1 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Fix studio controlsHenning Gruendl2019-06-0715-60/+56
| | | | | | | | | | | | | | | | | | | | | | * Fix CheckBox hover and focus behavior * Fix CheckBox long label issue * Refactor SpinBox wrapper property * Fix SpinBoxIndicator active focus on use * Refactor edit state in all controls Change-Id: Ice12aac7b97a36a658dadfac68457aefe0d757a1 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Some layout adjustmentsThomas Hartmann2019-06-071-18/+10
| | | | | | | | | | | | Change-Id: Ibf752ff24c1e79629a49061abeb7f87136a7a316 Reviewed-by: Aleksei German <aleksei.german@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Remove printThomas Hartmann2019-06-061-2/+0
| | | | | | | | | | | | Change-Id: Iadf0a1343974eb034ecca1e5b64b90b4a525849f Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Use new controls in TargetComboBoxThomas Hartmann2019-06-061-6/+4
| | | | | | | | | | | | Change-Id: I8f65e673843c119de1f910b7e2c4d35fccfd8a94 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | QmlDesigner: Use new controls in UrlChooserThomas Hartmann2019-06-061-10/+9
| | | | | | | | | | | | Change-Id: I07e6110f4e2d2c7458860db0432fb58afacf7015 Reviewed-by: Henning Gründl <henning.gruendl@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>