aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* Auto Test: Fix UI text in wizardLeena Miettinen2018-02-061-2/+2
| | | | | Change-Id: I38057341ef2e5a95e44a111742537bd3cb67bbdd Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* CppEditor: Require CppEditor plugin for C/C++ wizardsThomas Hartmann2018-02-052-2/+2
| | | | | Change-Id: Ia6371d6cdb8c42df92c3261050262c37a3ff2c60 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* ScxmlEditor: Require ScxmlEditor plugin for wizardThomas Hartmann2018-02-051-1/+1
| | | | | | Change-Id: If5892f37b9e8d919100a659629e6e2325e25cc83 Reviewed-by: Marco Benelli <marco.benelli@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Debugger: add dumper for Kit and ToolChainDavid Schulz2018-02-021-0/+8
| | | | | Change-Id: I48b5f686aa268a554922b495b416724ddc8973f2 Reviewed-by: hjk <hjk@qt.io>
* Build Qbs QML type info dynamicallyChristian Kandeler2018-02-021-0/+4
| | | | | | | | ... when building with qbs. Optionally also update the copies in the repository. Change-Id: I4604eff6de95101a8cb086708d5a9ef24af0fd32 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QmlProject: Add support for setting the environmentThomas Hartmann2018-02-021-0/+3
| | | | | | | | | | | This allows setting arbitrary environment variables in the .qmlproject. This is required for example qtquickcontrols2.conf and QT_AUTO_SCREEN_SCALE_FACTOR. Task-number: QTCREATORBUG-19513 Change-Id: I8421a9fc7f85d24b3564f1b60f383be3838f2af4 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Update QML typeinfo for qbs filesChristian Kandeler2018-02-012-7/+29
| | | | | Change-Id: I410db00dde848a6fab9078ff701fe3666b42dcf3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* AutoTest: Provide missing QtQuick test templateChristian Stenger2018-02-016-6/+98
| | | | | | | | | | The Auto Test Project wizard had minimal templates for QtTest and GoogleTest. Provide the QtQuick minimum template as well. Task-number: QTCREATORBUG-19579 Change-Id: I0efc1915c3bd0c251d8b94c50ed7ed6341812242 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* ModelEditor: Add text to scratch model wizard iconEike Ziller2018-02-011-0/+1
| | | | | | | Like for the non-scratch wizard, separating it from SCXML. Change-Id: Ia0ce6bad14dae8c3d7522c1d1dcdc4d87f77b77e Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* QmlDesigner: Add keyframe support to property editorThomas Hartmann2018-01-311-0/+6
| | | | | | | This patch allows to insert key frames if a timeline is present. Change-Id: I39c8281e5e559a838ad61939d3f2db7c6abcf76b Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* qmlproject.qmltypes: Fix syntax errorFriedemann Kleint2018-01-311-2/+2
| | | | | | | Amends e44504371c99960e05ca42bae4ce404bcc18998a. Change-Id: I0cc3ae874b27cfb6572bf111c1ab628ed113d955 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Wizards: Fix QtQuick - Empty wizard for cmakeChristian Stenger2018-01-291-1/+3
| | | | | | | | | cmake does not automatically set the C++ standard to C++-11 when using Qt5.6. Explicitly set it to have a compiling template. Task-number: QTCREATORBUG-19670 Change-Id: Ibba1f58951f96c4834985bff2298d606e9aa56bc Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QmlProjectManager: Prepare for running on remote devicesUlf Hermann2018-01-291-0/+1
| | | | | | | | | | We add a "targetDirectory" property to the file format and fill in the deployment data. (cherry picked from commit fba61c5b55052c382e030748fa6e2703abb5401d) Change-Id: If207cd5c77175c54cffdb5df92ea85c425cd3191 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* QmlProfiler: Fix translations and tests for statistics viewUlf Hermann2018-01-265-5/+5
| | | | | | | | The statistics view is not called "events" anymore. Task-number: QTCREATORBUG-19658 Change-Id: Iff4375d3dc0cf5d82d118244698887818f924c07 Reviewed-by: Robert Loehning <robert.loehning@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>
* Debugger: Also extract Qt namespaces for libinfixed Qt buildhjk2018-01-221-7/+4
| | | | | | | | GDB-only for now. Task-number: QTCREATORBUG-19620 Change-Id: I2ca3a927623ec0df742fed65048e8a3bcfa5cee2 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Merge "Merge remote-tracking branch 'origin/4.5' into 4.6" into 4.6Eike Ziller2018-01-221-2/+2
|\
| * Merge remote-tracking branch 'origin/4.5' into 4.6Eike Ziller2018-01-221-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/shared/qbs Change-Id: I5314559cbf188e4c339de44052c6e0c89d3c2aa6
| | * Unify German translation of "text editor"Robert Loehning2018-01-181-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: Ib9b62922c949084d4f5e7a92675bcb7530c92c5c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | | Improve translated strings and make them consistentRobert Loehning2018-01-221-1/+1
|/ / | | | | | | | | Change-Id: I88a6e6ceaa44b22539449037faa788caa9f349fc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/4.5' into 4.6Eike Ziller2018-01-151-4556/+7731
|\| | | | | | | Change-Id: I9277a92341ede8292978f2684eadcade04689983
| * Update German translationsRobert Loehning2018-01-121-4556/+7731
| | | | | | | | | | | | Change-Id: Ia6c9a0b06aff7a83d5d01290b66c2dbbdbcb47d6 Reviewed-by: Jochen Becher <jochen_becher@gmx.de> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | QmlDesigner: Add missing font and text properties for Qt 5.10Thomas Hartmann2018-01-103-6/+54
| | | | | | | | | | | | Task-number: QTPM-862 Change-Id: I12813cf429f4f4a5a85c4e3c6d74eb7ac1a45bd2 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | ModelEditor: add wizard for scratch modelsJochen Becher2018-01-094-0/+90
| | | | | | | | | | Change-Id: Idc6841984aa258ab668416f891ecbaf7bd32164e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | ModelEditor: Add Deployment diagramsJochen Becher2018-01-091-0/+282
| | | | | | | | | | Change-Id: Ib8c9ce2dff3fc9d52ff35f2ad89d8c281683200e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | ModelEditor: Minor improvements of documentationJochen Becher2018-01-091-16/+16
| | | | | | | | | | Change-Id: Iec789a3bd89136c3346f6ce8db636c069d7c842b Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | ModelEditor: Support text alignment in custom iconsJochen Becher2018-01-091-0/+2
| | | | | | | | | | Change-Id: I69a5b10a3bf46d40744b002eea47fa926a617c17 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | ModelEditor: fix text labels in sequence diagramsJochen Becher2018-01-091-0/+7
| | | | | | | | | | Change-Id: I7825a65a6c27c5c48bc1b8e6b6b4e532b252bc5d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2018-01-092-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/cpptools/clangcompileroptionsbuilder.cpp src/plugins/cpptools/clangcompileroptionsbuilder.h src/plugins/cpptools/compileroptionsbuilder.cpp src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp src/plugins/qmlprofiler/qmlprofilerclientmanager.h src/plugins/qmlprofiler/qmlprofilertraceclient.cpp src/plugins/qmlprofiler/qmlprofilertraceclient.h src/shared/qbs Change-Id: I364ababc5d41046d17e999096c4a7187c4e4e010
| * Fix typo in Russian translationSergey Belyashov2018-01-091-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-19555 Change-Id: I4bc595e1d724ff6231f4dc5d6fcc266c8c3468ea Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
| * Dark Theme: Fix bad color valueOrgad Shaneh2018-01-051-1/+1
| | | | | | | | | | Change-Id: Ie798db7cd887ff3933832e8589c908b115699529 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | AutoTest: Fix wizard for gtest on WindowsChristian Stenger2018-01-081-1/+7
| | | | | | | | | | Change-Id: Iab9711df2455fc2efb678bfd85e8a95b2de7587c Reviewed-by: David Schulz <david.schulz@qt.io>
* | QmlJs: remove bundles for QtQuick1 type descriptionsMarco Benelli2018-01-082-33/+0
| | | | | | | | | | | | | | | | QtCreator now assumes that QtQuick2 is used, so the relevant bundle is loaded unconditionally. Change-Id: Ib6b7b0c9a949e74edf0e0b7f68b0c774d7bcb451 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Themes: Fix gradient color in Projects modeOrgad Shaneh2018-01-055-5/+5
| | | | | | | | | | | | Change-Id: Ic8187fa3a04e76111afa231f993b115933cd3ac5 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | Theme: Fix parsing of colors without alphaOrgad Shaneh2018-01-054-8/+8
| | | | | | | | | | | | | | | | | | | | Use QColor(const QString &) ctor instead of manual parsing. Uncovered by a19005fc38a6659a7008cf56181bfc1a96698300 which made the locator highlighting black. Change-Id: Ic11483613510e3cf97eede396e9b7d53bbc3ff61 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* | Debugger: Add some simple dumper for std::functionhjk2018-01-051-0/+13
| | | | | | | | | | | | | | | | | | Linux/gdb only, pretty print the cases of default constructed objects and real function pointers. Task-number: QTCREATORBUG-19410 Change-Id: I08332af649bda861d9f53c0e0feb1f37db72b875 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* | Merge remote-tracking branch 'origin/4.5'Oswald Buddenhagen2017-12-213-12/+6
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp src/plugins/qmlprofiler/qmlprofilertraceclient.cpp Change-Id: I94647f59d7a9df48168ac066555afe80f5f9b91f
| * Debugger: improve evaluate expression with cdbDavid Schulz2017-12-201-10/+4
| | | | | | | | | | | | | | | | Replace Evaluate with AddSymbol and create a PyValue representing that expression Change-Id: Ibb8ab70c41df81e9d7d683b633a070caa03036d3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Debugger: Suppress variables from unrelated scopeshjk2017-12-141-1/+1
| | | | | | | | | | | | Change-Id: Ib7ae6c2af37a2cdb7dfd63d0622e68b55f7a778d Task-number: QTCREATORBUG-19445 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| * Dumper: Fix typoChristian Stenger2017-12-131-1/+1
| | | | | | | | | | Change-Id: I2d7bbe88c4d1552dba505003020c86a406821f72 Reviewed-by: hjk <hjk@qt.io>
* | Debugger: Combine the InferiorShutdown{Ok,Failed} stateshjk2017-12-141-4/+2
| | | | | | | | | | | | | | ... into a InferiorShutdownFinished. Change-Id: Icb5394f38f52f7cf300dc83f4eb8f2f0777bbcba Reviewed-by: David Schulz <david.schulz@qt.io>
* | Debugger: Combine the EngineShutdown{Ok,Failed} stateshjk2017-12-141-1/+1
| | | | | | | | | | | | | | | | | | ... into a EngineShutdownFinished. They were never handled differently, and the only option is to proceed to DebuggerFinished anyway. So simplify the state machine a bit. Change-Id: Ied3be86fff6750abca578dc6788e4be1d895692b Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-12-122-986/+1538
|\| | | | | | | | | | | | | | | Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri Change-Id: Ic1ab71d0d40fa6c90e337c8ee9d9558e8f103eaa
| * Merge remote-tracking branch 'origin/4.4' into 4.5Eike Ziller2017-12-121-979/+1529
| |\ | | | | | | | | | Change-Id: Ia5b4d0c1c2b5a410ec3215df1c19b56e236606cf
| | * Update Polish translationsJarek Kobus2017-10-131-979/+1529
| | | | | | | | | | | | | | | Change-Id: I90b81cec2308a148206e3cd6ec50a8f73ec9f667 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * | Qt Quick Application wizards: No AA_EnableHighDpiScaling on SimulatorAlessandro Portale2017-12-111-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid setting Qt::AA_EnableHighDpiScaling when running in the simulator. Simulator detection is done by testing whether environment variable QTGLESSTREAM_DISPLAY is set. This amends 8c3bd6159436d099127bd9cbb8271be8e18f95a5 where all platforms except Windows were excluded from setting the flag. Task-number: QTBUG-64815 Change-Id: I8ab7ba9f24217915dc1d01e1f2eb5c37923c5504 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
* | | Merge remote-tracking branch 'origin/4.5'Eike Ziller2017-11-292-1/+6
|\| | | | | | | | | | | Change-Id: I86852d289c22210a0439e8e297819dc7276a96de
| * | Qt Quick Application wizards: Qt::AA_EnableHighDpiScaling only on WINAlessandro Portale2017-11-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting Qt::AA_EnableHighDpiScaling causes a few graphics backends to malfunction. This patch reduced the setting of the flag to happen only on Windows (it is automatically set on macOS with retina). Task-number: QTBUG-64815 Change-Id: I08fa5d1bd2c93e7a39c23487b684bd3f7b358783 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
| * | Dumper: Do not use enumHexDisplay unconditionallyChristian Stenger2017-11-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | This function is available only for GDB. When using CDB or LLDB this ends up in an exception. Change-Id: Ie1835c1b95cac99e3f996077f6a3d80b5591c145 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | | ModelEditor: Configure poor man's sequence diagramsJochen Becher2017-11-201-0/+120
| | | | | | | | | | | | | | | Change-Id: I6bcdec40838c609ea4b01e5fc1a2b6269491d27d Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>