Commit Graph

5216 Commits

Author SHA1 Message Date
Eike Ziller
c26767e73c Merge "Merge remote-tracking branch 'origin/4.6'" 2018-03-13 10:50:38 +00:00
Eike Ziller
0b10ecc718 Merge remote-tracking branch 'origin/4.6'
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
2018-03-13 11:25:38 +01:00
David Schulz
61e93a0524 Snippets: Add snippet for namespace with closing comment
Change-Id: Id0f0110ac427b3a6460eeae2891cd1c5c65fc6a3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-13 10:17:12 +00:00
Christian Stenger
d90da11f07 AutoTest: Update Qbs/GTest wizard
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>
2018-03-09 15:47:57 +00:00
Thomas Hartmann
c25ba91fc1 Fix compile
Change-Id: I0837b8830735f80dd98928769e603907226ab6e0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-03-09 15:37:37 +00:00
Thomas Hartmann
8a8b8c4602 QmlDesigner: Add meta hint if item renders children directly
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>
2018-03-09 15:05:22 +00:00
Sergey Belyashov
9853667c3a Update Russian translation
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>
2018-03-06 19:20:25 +00:00
Eike Ziller
205c930592 Merge remote-tracking branch 'origin/4.6'
Change-Id: I63f8aebb201936f671b1486ff9420f67e5e3fafc
2018-03-01 15:46:37 +01:00
Oswald Buddenhagen
ecced3d3f1 fix ts-all target
add forgotten $$.

amends b795cc152c.

Change-Id: I39f9e2846bebaf88db98a1abf641f31dbe0025d4
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-03-01 13:13:07 +00:00
Thomas Hartmann
8cece3226c QmlDesigner: Fix crash in puppet
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>
2018-02-28 16:14:24 +00:00
Marco Benelli
5489ac10d9 qmljs: fix syntax errors in qbs-base.qmltypes
Change-Id: I0e8dc5a345f5a33a0f925f8a3dfe169c6d70e2a1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-02-28 12:58:44 +00:00
hjk
73c72fa6a7 QmlPuppet: Remove unused static function
Change-Id: I8c439f87c30b4b4102f0839cc745120568e6f34f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-02-28 07:23:47 +00:00
Marco Benelli
2acb365dac qmljs: relax checks for qbs files
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>
2018-02-27 15:17:44 +00:00
Eike Ziller
7c3cfa166d Merge remote-tracking branch 'origin/4.6'
Conflicts:
	src/plugins/coreplugin/helpmanager.cpp

Change-Id: I2feb60ec0afb2f22f75dc137a01c3fa217b299d8
2018-02-23 10:56:52 +01:00
Ivan Donchevskii
34fec1cad2 Clang: Make Q_PROPERTY replacement simpler
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>
2018-02-23 08:40:33 +00:00
Marco Benelli
336ab17614 qmljs: autocompletion for Qt3D modules importing
Task-number: QTCREATORBUG-19885
Change-Id: Ie2153186199cac45b5cb273d7f7cf088beb689f4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-02-23 08:17:31 +00:00
Christian Stenger
f350018999 Welcome: Prohibit rename and delete of default session
Task-number: QTCREATORBUG-19642
Change-Id: I97d9fa84aad510fd8c2d95d3324f77fbcae4e9d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-02-20 19:39:06 +00:00
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
Christian Kandeler
bc15b47487 Build Qbs QML type info dynamically
... when building with qbs. Optionally also update the copies in the
repository.

Change-Id: I4604eff6de95101a8cb086708d5a9ef24af0fd32
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2018-02-02 09:14:01 +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