aboutsummaryrefslogtreecommitdiffstats
path: root/share/qtcreator
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Clang: Support old-style SIGNAL/SLOT macroIvan Donchevskii2018-05-031-0/+3
| | | | | | | | Color types and enable Ctrl+click for the functions and types inside SIGNAL/SLOT macros. Change-Id: Ic1c0b7372fe9a73c5607b1973d75a6656c75ef0e Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
* Wizards: Add deployment rules to Widgets and Console applicationsKari Oikarinen2018-05-031-0/+5
| | | | | | | | | | Otherwise they can't be deployed to Boot2Qt (and other) devices. Quick application wizards already have these deployment rules. Task-number: QTCREATORBUG-20358 Change-Id: I5a19ada3f6a382e8553750769478c398a50352c9 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Kari Hormi <kari.hormi@qt.io>
* dark theme: Define splitterColorAlessandro Portale2018-04-271-2/+3
| | | | | | | | | Color "SplitterColor" is neither a named color nor a valid color Fix-up for: 98e26dc6fb91f3d083d028cb85d468258dac3f55 Change-Id: I2d3749a06850e4c630d6a0392e6a1c6e2a75258f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlDesigner: Use native text rendering for textfieldThomas Hartmann2018-04-171-0/+1
| | | | | | Change-Id: I01aea1d0bceeeb5f8942d79d234d674e3173ccfc Reviewed-by: Brook Cronin <brook.cronin@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* QmlDesigner: Add a couple of new theme colorsThomas Hartmann2018-04-176-11/+31
| | | | | Change-Id: Iab39c0dae28d82f76a8d2ac8bc26562c89bf8e7c Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-04-138-10/+69
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Qml tooling: Support Qt 5.11Alessandro Portale2018-04-126-6/+60
| | | | | | | | | | | | | | | | | | | | QtQuick 2.11 QtQuick.Controls 2.4 QtQuick.Window 2.11 Change-Id: I78df0cf414e6c2ce72830b88d29a8777ac30c757 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
| * 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>
| * Dumper: Return correct address on extractPointer for arraysOrgad Shaneh2018-04-031-0/+5
| | | | | | | | | | | | Change-Id: I8e25cca4553a8b69703ac0ffa80231f97cdef980 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Debugger: Make libcxx's std::vector plottablehjk2018-04-121-0/+3
| | | | | | | | | | | | Task-number: QTCREATORBUG-20249 Change-Id: Idc17fcbda34273b4f29f0da0b01eddcd4f83c52d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Slightly increase section sizeThomas Hartmann2018-04-111-2/+2
| | | | | | | | | | Change-Id: Iaa42a5e7fa1b58bf77f05ea04fcb997b647f474a Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Clang: Clean up qobjectdefs.hNikolai Kosjar2018-04-111-3/+1
| | | | | | | | | | | | | | | | * Remove unneeded #include that might lead to false diagnostics * Fix typo Change-Id: I38a3bbe07dbcb33f004c7b7a2a4ca4a90fb77350 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | QmlDesigner: Increase size of states editorThomas Hartmann2018-04-102-3/+3
| | | | | | | | | | Change-Id: I5541214ca8aa518a59d0fa6563e59f69f8048eda Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Slightly increase section sizeThomas Hartmann2018-04-101-1/+1
| | | | | | | | | | Change-Id: Ifa41cbff552c61cac47f09faf5e96dba8734e3fa Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Adjust font pixel size if pixel density is highThomas Hartmann2018-04-103-3/+3
| | | | | | | | | | | | | | | | We define some fonts in pixel size and those have to be increased if the pixel density is high. Change-Id: I88e932d967aaa9d8757e733048d457e9e7c17f5b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | QmlDesigner: Remove programmatical derivation of theme colorsAlessandro Portale2018-04-055-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Clang: Fix parse errors in clazy/tidy demo projectNikolai Kosjar2018-04-042-6/+11
| | | | | | | | | | | | | | ...otherwise not all intended diagnostics can be demonstrated. Change-Id: I2f69862cc6c8a2e58059d9075ad6fd7c7e72b4a5 Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
* | Debugger: Remove some spurious '.report' content from dumper outputhjk2018-03-231-1/+1
| | | | | | | | | | | | | | | | No real damage, the parser on the Creator side is apparently robust enough. Still no need to add this. Change-Id: I8329a55c44f866070fb3df48c3a22000ee33e848 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Debugger: Fix enum dumperhjk2018-03-225-40/+27
| | | | | | | | | | | | | | Make the hex display work with LLDB, fix GDB and LLDB test. Change-Id: I529b5cdc908dbcba7270bc4574fa59a012fcacad Reviewed-by: David Schulz <david.schulz@qt.io>
* | Debugger: Make QList as movablehjk2018-03-201-1/+5
| | | | | | | | | | | | | | | | Apparently changed in qtbase dafa3618d23. Task-number: QTCREATORBUG-19812 Change-Id: I70f543c71cc2147cbd5ab33a070e1a35049f46a8 Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-161-529/+1197
|\| | | | | | | | | | | | | | | | | | | | | 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
| * Update German translationRobert Loehning2018-03-131-529/+1197
| | | | | | | | | | Change-Id: I8960605dbf5a06ae4cce0e965103e67505e0434b Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge "Merge remote-tracking branch 'origin/4.6'"Eike Ziller2018-03-1310-574/+1286
|\ \
| * | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-1310-574/+1286
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * AutoTest: Update Qbs/GTest wizardChristian Stenger2018-03-092-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using undefined objects pass the needed objects around to access them inside the JavaScript file. Also update deprecated function use. Change-Id: I4c0cafc319047d0b72a0f9310e5335f793f800ac Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| | * 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>
| | * Update Russian translationSergey Belyashov2018-03-061-547/+1206
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ic59eaaeec67f8aab71faec4e47910fc6755d7f6e Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | | Snippets: Add snippet for namespace with closing commentDavid Schulz2018-03-131-0/+3
|/ / | | | | | | | | Change-Id: Id0f0110ac427b3a6460eeae2891cd1c5c65fc6a3 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-03-013-1/+158
|\| | | | | | | Change-Id: I63f8aebb201936f671b1486ff9420f67e5e3fafc
| * fix ts-all targetOswald Buddenhagen2018-03-011-1/+1
| | | | | | | | | | | | | | | | | | add forgotten $$. amends b795cc152c0. Change-Id: I39f9e2846bebaf88db98a1abf641f31dbe0025d4 Reviewed-by: David Schulz <david.schulz@qt.io>
| * 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>
| * qmljs: fix syntax errors in qbs-base.qmltypesMarco Benelli2018-02-281-6/+6
| | | | | | | | | | Change-Id: I0e8dc5a345f5a33a0f925f8a3dfe169c6d70e2a1 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| * qmljs: relax checks for qbs filesMarco Benelli2018-02-271-0/+154
| | | | | | | | | | | | | | | | | | | | | | Types information for qbs is more limited that qml; this causes qtcreator to raise false positives. This patch relax the checks and provide some type information needed by qbs files generated by the wizards. Task-number: QTCREATORBUG-19757 Change-Id: I07a1dd9d8fedaf4c5c751c2f00643f15ae39127a Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* | QmlPuppet: Remove unused static functionhjk2018-02-281-19/+0
| | | | | | | | | | Change-Id: I8c439f87c30b4b4102f0839cc745120568e6f34f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-02-239-3/+80
|\| | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/helpmanager.cpp Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8
| * qmljs: autocompletion for Qt3D modules importingMarco Benelli2018-02-231-0/+7
| | | | | | | | | | | | Task-number: QTCREATORBUG-19885 Change-Id: Ie2153186199cac45b5cb273d7f7cf088beb689f4 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| * Welcome: Prohibit rename and delete of default sessionChristian Stenger2018-02-205-0/+5
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-19642 Change-Id: I97d9fa84aad510fd8c2d95d3324f77fbcae4e9d5 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
| * Editor: make additional snippet info translatableDavid Schulz2018-02-162-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | Additional snippet information is displayed in the options and when completing snippets to distinguish between multiple snippets with the same trigger. This information is extracted from xml files. Translate these strings like the information for external tools. Task-number: QTCREATORBUG-5912 Change-Id: I90a22d687a99339b8f30c0de3b04b379085b6bd5 Reviewed-by: Robert Loehning <robert.loehning@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* | Clang: Make Q_PROPERTY replacement simplerIvan Donchevskii2018-02-231-8/+2
| | | | | | | | | | | | | | | | | | | | | | The infrastructure around Q_PROPERTY extraction allows to make it static assert and still find it's parent. This way makes it easier for Clang to parse and does not provide unexisting functions for class. Change-Id: I1c40550c72d214c2448169094a46c6f793132f23 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | Clang: Fix parsing for files which include qobjectdefs.hIvan Donchevskii2018-02-201-3/+3
| | | | | | | | | | | | | | | | For some reason did not work properly with include guards before #include_next. Change-Id: I4a314c0e4ff29487904e2daa64362c3e2a3e1859 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | Clang: Provide example with clazy warningsIvan Donchevskii2018-02-202-1/+139
| | | | | | | | | | Change-Id: I23cb81d0ffe0d23428ce85ba22d85e1d6c8c1216 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | Clang: Provide example with a lot of tidy warningsIvan Donchevskii2018-02-203-0/+321
| | | | | | | | | | Change-Id: I6d6d2559bb8e2b6c972e88c3af9ce06968e7c959 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* | Clang: Properly handle Q_PROPERTY in TokenInfoIvan Donchevskii2018-02-201-0/+17
|/ | | | | | | | | Transform Q_PROPERTY into unique AST node. Mark different parts with types and search for parent in FullTokenInfos. Change-Id: Iaa1ec0c73d34773edf5605d3682bd6a290d195de Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* Improve translated stringsRobert Loehning2018-02-091-2/+2
| | | | | | Change-Id: I7a45c6f8dcbb0e1b3c17a60823664fe1943c5654 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Debugger: Fix attaching to core for LLDBChristian Stenger2018-02-081-1/+4
| | | | | | | Task-number: QTCREATORBUG-18722 Change-Id: I4579fff9725f4a7578642080a010ca54b221969b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: hjk <hjk@qt.io>
* Qt Quick Designer: Fix caps for property editor textLeena Miettinen2018-02-063-4/+4
| | | | | Change-Id: I8a0e727e981f5cd2c441fadda0cb71718ec1c667 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Revert "Wizards: Accept asynchronous root components for qqapplication"Alessandro Portale2018-02-061-19/+3
| | | | | | | | | | | This reverts commit dcb8681cb79cb91df14bc051025a1bf9705f7c84. The effort to handle asynchronous loading is not required for the qmllivepreview (for which it had been introduced). Task-number: QTCREATORBUG-19648 Change-Id: I20cbd318dedb3da43d4993c0c0a1910ffe6d5761 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>