Commit Graph

7806 Commits

Author SHA1 Message Date
Ivan Donchevskii
c39f28d5e0 Clang: Fix parsing for files which include qobjectdefs.h
For some reason did not work properly with include guards
before #include_next.

Change-Id: I4a314c0e4ff29487904e2daa64362c3e2a3e1859
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-20 13:44:00 +00:00
Ivan Donchevskii
1ed7d3c270 Clang: Provide example with clazy warnings
Change-Id: I23cb81d0ffe0d23428ce85ba22d85e1d6c8c1216
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-20 06:50:19 +00:00
Ivan Donchevskii
cec807f5c1 Clang: Provide example with a lot of tidy warnings
Change-Id: I6d6d2559bb8e2b6c972e88c3af9ce06968e7c959
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-02-20 06:50:12 +00:00
Ivan Donchevskii
66c7629814 Clang: Properly handle Q_PROPERTY in TokenInfo
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>
2018-02-20 06:49:47 +00:00
David Schulz
b795cc152c Editor: make additional snippet info translatable
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>
2018-02-16 06:09:20 +00:00
Thomas Hartmann
4ab5dbeb3a QmlDesigner: Use file engine to resolve resources in puppet
Task-number: QTCREATORBUG-19729
Change-Id: I1297180e29446429b949fc0bbc1b74055018bc28
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-14 11:49:42 +00:00
Robert Loehning
7282e05554 Improve translated strings
Change-Id: I7a45c6f8dcbb0e1b3c17a60823664fe1943c5654
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-02-09 16:36:54 +00:00
Christian Stenger
42e224eb4b Debugger: Fix attaching to core for LLDB
Task-number: QTCREATORBUG-18722
Change-Id: I4579fff9725f4a7578642080a010ca54b221969b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-02-08 06:05:16 +00:00
Leena Miettinen
c4202f28fe Qt Quick Designer: Fix caps for property editor text
Change-Id: I8a0e727e981f5cd2c441fadda0cb71718ec1c667
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-02-06 12:02:51 +00:00
Alessandro Portale
3f757998b5 Revert "Wizards: Accept asynchronous root components for qqapplication"
This reverts commit dcb8681cb7.

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>
2018-02-06 09:50:02 +00:00
Leena Miettinen
b9d95f7946 Auto Test: Fix UI text in wizard
Change-Id: I38057341ef2e5a95e44a111742537bd3cb67bbdd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-02-06 07:46:35 +00:00
Thomas Hartmann
d110b2f4db CppEditor: Require CppEditor plugin for C/C++ wizards
Change-Id: Ia6371d6cdb8c42df92c3261050262c37a3ff2c60
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-05 09:06:24 +00:00
Thomas Hartmann
84b90abb9b ScxmlEditor: Require ScxmlEditor plugin for wizard
Change-Id: If5892f37b9e8d919100a659629e6e2325e25cc83
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-05 09:06:14 +00:00
David Schulz
6c507beb1e Debugger: add dumper for Kit and ToolChain
Change-Id: I48b5f686aa268a554922b495b416724ddc8973f2
Reviewed-by: hjk <hjk@qt.io>
2018-02-02 14:39:27 +00:00
Thomas Hartmann
ef9ac8f2f4 QmlProject: Add support for setting the environment
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>
2018-02-02 07:18:20 +00:00
Christian Kandeler
09f8bd3ac0 Update QML typeinfo for qbs files
Change-Id: I410db00dde848a6fab9078ff701fe3666b42dcf3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-02-01 14:17:03 +00:00
Christian Stenger
e43668f603 AutoTest: Provide missing QtQuick test template
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>
2018-02-01 09:23:07 +00:00
Eike Ziller
97631cfdb8 ModelEditor: Add text to scratch model wizard icon
Like for the non-scratch wizard, separating it from SCXML.

Change-Id: Ia0ce6bad14dae8c3d7522c1d1dcdc4d87f77b77e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-01 08:46:09 +00:00
Thomas Hartmann
f2e6fc9560 QmlDesigner: Add keyframe support to property editor
This patch allows to insert key frames if a timeline is present.

Change-Id: I39c8281e5e559a838ad61939d3f2db7c6abcf76b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-31 16:42:05 +00:00
Friedemann Kleint
8a8ad532cf qmlproject.qmltypes: Fix syntax error
Amends e44504371c.

Change-Id: I0cc3ae874b27cfb6572bf111c1ab628ed113d955
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-01-31 07:31:32 +00:00
Christian Stenger
2e8527c7e5 Wizards: Fix QtQuick - Empty wizard for cmake
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>
2018-01-29 10:54:10 +00:00
Ulf Hermann
e44504371c QmlProjectManager: Prepare for running on remote devices
We add a "targetDirectory" property to the file format and fill in the
deployment data.

(cherry picked from commit fba61c5b55)
Change-Id: If207cd5c77175c54cffdb5df92ea85c425cd3191
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-29 09:04:45 +00:00
Ulf Hermann
13ba063696 QmlProfiler: Fix translations and tests for statistics view
The statistics view is not called "events" anymore.

Task-number: QTCREATORBUG-19658
Change-Id: Iff4375d3dc0cf5d82d118244698887818f924c07
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-01-26 11:26:48 +00:00
Thomas Hartmann
a7515d25a9 QmlDesigner: Avoid detachs
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>
2018-01-23 10:14:12 +00:00
hjk
58f457f405 Debugger: Also extract Qt namespaces for libinfixed Qt build
GDB-only for now.

Task-number: QTCREATORBUG-19620
Change-Id: I2ca3a927623ec0df742fed65048e8a3bcfa5cee2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-22 13:59:42 +00:00
Eike Ziller
49ed91b205 Merge "Merge remote-tracking branch 'origin/4.5' into 4.6" into 4.6 2018-01-22 13:17:10 +00:00
Robert Loehning
63e47f903f Improve translated strings and make them consistent
Change-Id: I88a6e6ceaa44b22539449037faa788caa9f349fc
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-01-22 11:56:01 +00:00
Eike Ziller
8921888ce3 Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
	src/shared/qbs

Change-Id: I5314559cbf188e4c339de44052c6e0c89d3c2aa6
2018-01-22 12:46:10 +01:00
Robert Loehning
bf37524ddd Unify German translation of "text editor"
Change-Id: Ib9b62922c949084d4f5e7a92675bcb7530c92c5c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-18 11:08:27 +00:00
Eike Ziller
0af3a2d29a Merge remote-tracking branch 'origin/4.5' into 4.6
Change-Id: I9277a92341ede8292978f2684eadcade04689983
2018-01-15 09:49:21 +01:00
Robert Loehning
c0aaba0868 Update German translations
Change-Id: Ia6c9a0b06aff7a83d5d01290b66c2dbbdbcb47d6
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-01-12 14:49:53 +00:00
Thomas Hartmann
50ca0de846 QmlDesigner: Add missing font and text properties for Qt 5.10
Task-number: QTPM-862
Change-Id: I12813cf429f4f4a5a85c4e3c6d74eb7ac1a45bd2
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-10 10:30:59 +00:00
Jochen Becher
58a1648326 ModelEditor: add wizard for scratch models
Change-Id: Idc6841984aa258ab668416f891ecbaf7bd32164e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:53 +00:00
Jochen Becher
6bb2c1196d ModelEditor: Add Deployment diagrams
Change-Id: Ib8c9ce2dff3fc9d52ff35f2ad89d8c281683200e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:43 +00:00
Jochen Becher
991a9ce5c1 ModelEditor: Minor improvements of documentation
Change-Id: Iec789a3bd89136c3346f6ce8db636c069d7c842b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:23:13 +00:00
Jochen Becher
0c7ce54cc6 ModelEditor: Support text alignment in custom icons
Change-Id: I69a5b10a3bf46d40744b002eea47fa926a617c17
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:21:10 +00:00
Jochen Becher
eceaf47614 ModelEditor: fix text labels in sequence diagrams
Change-Id: I7825a65a6c27c5c48bc1b8e6b6b4e532b252bc5d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-01-09 14:20:58 +00:00
Eike Ziller
cff2cc90e2 Merge remote-tracking branch 'origin/4.5'
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
2018-01-09 13:13:00 +01:00
Sergey Belyashov
32786ea9ca Fix typo in Russian translation
Task-number: QTCREATORBUG-19555
Change-Id: I4bc595e1d724ff6231f4dc5d6fcc266c8c3468ea
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
2018-01-09 10:17:32 +00:00
Christian Stenger
38d5c585af AutoTest: Fix wizard for gtest on Windows
Change-Id: Iab9711df2455fc2efb678bfd85e8a95b2de7587c
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-01-08 14:20:02 +00:00
Marco Benelli
d11e31230c QmlJs: remove bundles for QtQuick1 type descriptions
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>
2018-01-08 13:15:23 +00:00
Orgad Shaneh
91c50e797b Themes: Fix gradient color in Projects mode
Change-Id: Ic8187fa3a04e76111afa231f993b115933cd3ac5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-01-05 14:53:59 +00:00
Orgad Shaneh
add1bdf43f Theme: Fix parsing of colors without alpha
Use QColor(const QString &) ctor instead of manual parsing.

Uncovered by a19005fc38 which made the
locator highlighting black.

Change-Id: Ic11483613510e3cf97eede396e9b7d53bbc3ff61
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-01-05 09:03:10 +00:00
Orgad Shaneh
6797ca18f6 Dark Theme: Fix bad color value
Change-Id: Ie798db7cd887ff3933832e8589c908b115699529
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-01-05 07:35:25 +00:00
hjk
0cce7a82fe Debugger: Add some simple dumper for std::function
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>
2018-01-05 07:20:26 +00:00
Oswald Buddenhagen
777ca8e655 Merge remote-tracking branch 'origin/4.5'
Conflicts:
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp

Change-Id: I94647f59d7a9df48168ac066555afe80f5f9b91f
2017-12-21 13:20:24 +01:00
David Schulz
b2052561cc Debugger: improve evaluate expression with cdb
Replace Evaluate with AddSymbol and create a PyValue representing
that expression

Change-Id: Ibb8ab70c41df81e9d7d683b633a070caa03036d3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-20 09:32:18 +00:00
hjk
79ba461a46 Debugger: Suppress variables from unrelated scopes
Change-Id: Ib7ae6c2af37a2cdb7dfd63d0622e68b55f7a778d
Task-number: QTCREATORBUG-19445
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-12-14 13:40:08 +00:00
hjk
83c13ff191 Debugger: Combine the InferiorShutdown{Ok,Failed} states
... into a InferiorShutdownFinished.

Change-Id: Icb5394f38f52f7cf300dc83f4eb8f2f0777bbcba
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-12-14 11:26:52 +00:00
hjk
585b2c62d5 Debugger: Combine the EngineShutdown{Ok,Failed} states
... 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>
2017-12-14 09:42:44 +00:00