Commit Graph

57165 Commits

Author SHA1 Message Date
Thomas Hartmann
7421e59a77 QmlDesigner: Escape @ for annotations
We use the @ for property names in annotations, but
this is no correct QML.
So we replace @ by __AT__

Change-Id: I9437f3b7b1e0489619bc89a20452cc2586be8f12
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-20 13:53:17 +00:00
Thomas Hartmann
f3b9b630c8 QmlDesigner: Fix crash
The QML code for the annotations can be syntactically incorrect.
We have to check this case.

Change-Id: I5428b7963e905c65d65d8524316b2f81c952cb40
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-20 13:41:11 +00:00
Thomas Hartmann
31ef685473 QmlDesigner: Rename QmlTimelineFrames to QmlTimelineKeyframeGroup
Change-Id: I7b1a325e0e9567ddd9b887e3ea013b67d0bde3a8
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-04-20 13:12:31 +00:00
Robert Loehning
1e31683b7d Squish: Update expected tree after removing WebEngine
Change-Id: I097dce55361027acc459070ac750610ec80fa6c9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-20 12:27:44 +00:00
Christian Stenger
92f30a6890 ProjectExplorer: Fix compile for gcc4.9
Broke with b9278a88d0.

Change-Id: Ic1de9530bd680a9951b64a298736f6c41de2f5f9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-20 12:08:28 +00:00
Eike Ziller
cef50e4166 Fix removal of projects from file system view
The destruction of a project can still trigger file list changes, so
just check if the project is actually still registered before updating
anything.

Task-number: QTCREATORBUG-20314
Change-Id: I0d634ca8986d1f09e84c310ae732c0bcdc675534
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-20 11:46:05 +00:00
Tim Jenssen
bd836a8d24 QtQuickDeisgner: reformat and use algorithms
Change-Id: Ib98f625b86da671c7fc42594a9bc61682782a1b5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-20 10:36:31 +00:00
Tim Jenssen
239d6955dc QtQuickDesigner: remove unnecessary list member
no need to keep an extra list since we have access to
m_designerActionManager

Change-Id: I20e449beb24ab194a59b46dc4c677cd1e8152cca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-20 10:36:20 +00:00
Thomas Hartmann
2673e09ed6 QmlDesigner: Set TextToModelMerger active to false when returning
Change-Id: I188237d1ca3257f13691063d306e877137a5936d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-20 10:22:36 +00:00
Tobias Hunger
b9278a88d0 ToolChain: Use SettingsAccessor to access XML settings
This allows for use of the new SettingsAccessor infrastructure for
upgrading, backups, etc.

Task-number: QTCREATORBUG-20148
Change-Id: I5419c86c0fd576a59ec91c212097c8f987e01da2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-20 09:14:59 +00:00
Robert Loehning
db9922a5bf Squish: Fix expected compile error message
Change-Id: I37d9ea1cdbe21151f8f06cb53851143bbd2c3d6d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-20 08:45:49 +00:00
Robert Loehning
64b6cb88b0 Squish: Flip bool to its correct meaning
Change-Id: I8de704ca3086789a7c8bcb787e678ba10c42ca9d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-20 08:45:31 +00:00
Robert Loehning
038e214f90 Squish: Fix timing issue in tst_HELP04
Change-Id: Ib69429f9288fb767186c61e913a29fc75ddc4498
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-20 08:44:07 +00:00
Christian Stenger
95446fb614 AutoTest: Use TypedTreeItem for test tree items
Change-Id: I739b6aefc868550b01c7421b4b304293564bb7b6
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-20 06:52:46 +00:00
Vikas Pachdha
83d8de3366 Android: Check for AVD startup failure
Task-number: QTCREATORBUG-20160
Change-Id: Ifbae6d10da6c782e701bc7840ce4324526d0dd82
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-20 05:26:10 +00:00
Vikas Pachdha
503fb603c3 Android: Set proper environment for the avdmanager tool
Task-number: QTCREATORBUG-19988
Change-Id: If34b4ff570ed6d6fdbb91435913d9130feceb499
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-20 05:25:33 +00:00
Christian Stenger
366c7b2c32 RemoteLinux: Add tooltip for line edit
The line edit for the gdb server executable has a
placeholder text that is not readable due to the length
of the text. Add a tooltip that duplicates this text,
but is able to display it completely.

Change-Id: I1c15416f3b31420967825f1b99582021938d3628
Reviewed-by: hjk <hjk@qt.io>
2018-04-20 04:48:42 +00:00
Tobias Hunger
960a1eea06 ProjectExplorer: Do not warn about kits without toolchains
Kits without a toolchain set up for a language are fine. Continue
to warn about kits where the toolchain is set, but the relevant
toolchain can not be found.

Change-Id: I7c62f61264723f9851968aebba2c9307640d683b
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-19 14:14:14 +00:00
Robert Loehning
356a2fd855 Squish: Update tst_HELP04 for current Qt versions
Change-Id: I944f824807d47bcfaf9cabd2b15b678d858db15f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-19 14:06:34 +00:00
Robert Loehning
0e216fda3e Squish: Don't expect WebEngine or WebKit
Change-Id: Ib44d0c7671b016c27e33ffd66e4797be37523ca3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-19 14:06:03 +00:00
Tobias Hunger
2a34f2177c ProjectExplorer: Hide build page for projects that do not build
Change-Id: I56feaab67690b5ece7379a9c1f676392230de107
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-19 13:21:52 +00:00
Tobias Hunger
460fdc02e0 ProjectExplorer: Report project-specific kit errors/warnings
Report project-specific warnings about the kit used in Project Mode.
E.g. a python project should not complain about missing toolchains,
while a qmake project should.

Change-Id: I5ce6742683cdeffc7ff3f1a3e8f0b89aee9aa0b4
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-19 13:21:45 +00:00
Eike Ziller
da18fc1f50 Help: Use nullptr and fix a few warnings
Change-Id: I7f7307a765d8755bf96b0cad1210e61df0a0199f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-04-19 12:07:59 +00:00
Robert Loehning
d57ab7f6b9 Squish: Update tst_HELP04 for hidden "Search" button
Task-number: QTCREATORBUG-20295
Change-Id: Idada7f86088946ecddd69c0ac10656c202d4f566
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-19 11:36:45 +00:00
Christian Stenger
0e81d01b2a AutoTest: Improve error handling for XML parser
Task-number: QTCREATORBUG-20105
Change-Id: I55db5e7a41555861dee08e81655e5018b6ea1749
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-19 11:25:50 +00:00
Ulf Hermann
08ca10de81 QmlProfiler: Rename specific replayEvents to replayQmlEvents
Some compilers cannot discern the two replayEvents methods.

Change-Id: Ide4a893ff3976cb081fbbceefacafb6226f0a73f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-19 11:21:59 +00:00
Vikas Pachdha
6e4ae817c2 Android: Check for missing emulator tool
Task-number: QTCREATORBUG-20160
Change-Id: I481adfe9a7a1b2c9c151d01d2fe1b010735c898b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-04-19 10:05:03 +00:00
Tobias Hunger
26e4db6514 ProjectExplorer: Fix loop in toHtml call
Change-Id: Ic32209dbb13897575cbc1845c4afca1b01da1c64
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-19 09:30:59 +00:00
Ulf Hermann
1c2e0f387f QmlProfiler: Move parts of model manager and trace file to Timeline
This way we can use the trace file loading and saving mechanism for
other profilers.

Change-Id: I98ec1cdde6f7abcea152cabf72e64d4e696dfa59
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-19 08:09:07 +00:00
Eike Ziller
7099f21586 Merge remote-tracking branch 'origin/4.6'
Change-Id: I959428882b9da427c6bf522145646048141888c6
2018-04-19 09:25:04 +02:00
Vikas Pachdha
717c7bfd9f Android: Add explicit tag for google_apis system images
Task-number: QTCREATORBUG-20298
Change-Id: I9bc4d9192584ffbc1180ae7b69f334c915ca16f4
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2018-04-19 06:30:34 +00:00
David Schulz
20e67865ea CodeAssist: Store processor state in specialized objects
Change-Id: I19de64b948599c833496ab8caabf3eaafc845658
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-19 05:52:21 +00:00
Eike Ziller
dfd2dcb156 Add Collapse All action to context menu of file system view
Task-number: QTCREATORBUG-19212
Change-Id: Ia8771a27dbcf77c956f013ed001c7890d6fe6e9a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-18 15:12:32 +00:00
Thomas Hartmann
750df6dec5 QmlDesigner: Rename Keyframes to KeyframeGroup
Change-Id: Ib43d892a3319a0c5ef700147b245e2ba5d3a593b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-18 14:53:42 +00:00
Tobias Hunger
f406950ef5 ProjectExplorer: Add toHtml(QList<Task>) and use that in kit.cpp
This makes the code more reusable.

Change-Id: I1b2eebf8673a4a08a2a87a1e9ff1ac845a091467
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-18 14:35:32 +00:00
Tobias Hunger
c77af6bdf3 ProjectExplorer: Only warn about missing compilers
Not having a compiler defined in a kit is fine for e.g. Python
projects or QML projects. So only warn in that case.

Change-Id: Ic2bc30f8b70c804780b65e11915d1f231011a55c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-18 14:35:25 +00:00
Christian Stenger
cc0c7f2ccd Squish: Fix provided test settings for macOS
Change-Id: Idec36e178d448015efa6d0ff73a4d17eba6ba76e
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-04-18 11:57:20 +00:00
Tim Jenssen
c087c4d5a9 fix windows build
A header only file should not use any export macro.

Change-Id: Ia081b9227041cd59de7c0c5c656ad3fc57ac04cc
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-04-18 11:53:55 +00:00
Eike Ziller
0f090890a9 Disable help search widget while indexing documentation
If you try to search while indexing, in the best case you'd get
incomplete results (though with a warning that that is the case), and in
the worst case it crashes because of QTBUG-66816. So just disable the
search widget with info and progress indicator in that case.

Task-number: QTCREATORBUG-20295
Change-Id: Ibec602b1bc0e98f6fef029c6f10c0cdc5197294c
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-04-18 11:11:50 +00:00
Eike Ziller
3309ed8783 Android: Add 'inline' to static function in header
Clang complains with a warning otherwise

Change-Id: Ia833529e4c37bb8c68d5445a04a7602481571a95
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-04-18 11:11:22 +00:00
Robert Loehning
bb0358cc68 Squish: Add expected error message for MSVC2015
Change-Id: Id1ace17486af21c4c0786859178c3a82d6e05145
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-18 05:49:28 +00:00
Nikolai Kosjar
29110b68f7 Clang: Fix qbs build for libtooling components
Change-Id: I320e23ffd8a244a7582b9d4115f6c8616ba44022
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-04-17 14:25:00 +00:00
Christian Kandeler
c6cd9e8fbe Qbs run config: Run executable from installed location, if possible
It's been like that for a long time, but the behavior was inadvertantly
changed in a recent refactoring.

Change-Id: I2f301c995c1f9bb235718e02326c4c64dea91694
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-04-17 14:14:24 +00:00
Ulf Hermann
780d4c6a43 Timeline: Move modelId generation into aggregator
The way the notes model works requires every timeline model to have a
different ID. Conversely no other kind of model actually needs an ID.
Therefore it makes sense to have the TimelineModelAggregator manage the
IDs as every timeline model will sooner or later be associated with an
aggregator.

Change-Id: Ib8b2c88ed883351d4e3e156dd13e1dd113c21808
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 14:11:51 +00:00
Ulf Hermann
181ad6671c QmlProfiler: Add some missing override
Change-Id: I79930e6166617d1635d08dade47390ca5ee27268
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 13:19:41 +00:00
Ulf Hermann
7f7fe1a9db QmlProfiler: Avoid some 0 as nullptr warnings
Change-Id: I4763a22c6624eaffbb583bf26bf74a3e282b042f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-04-17 13:19:30 +00:00
Alessandro Portale
7293e800e1 Iconlister, a tool to create a catalouge of graphical assets
Change-Id: I39d009c41daaa07a61465ee29b3a5be32a32275e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-04-17 12:46:12 +00:00
Thomas Hartmann
288af3d27f QmlDesigner: Use native text rendering for textfield
Change-Id: I01aea1d0bceeeb5f8942d79d234d674e3173ccfc
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-17 12:31:44 +00:00
Thomas Hartmann
c77ab19ba8 QmlDesigner: restore auxiliary data when file is loaded
Change-Id: Iacf8ef63d8e841a637fadd5eb78ed8facd2cb5c5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-17 12:31:33 +00:00
Thomas Hartmann
963ffb1096 QmlDesigner: Write annotations if file is saved
Change-Id: I729205715493f65b83e2de6f09d3d968187afe7a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-04-17 12:31:23 +00:00