Commit Graph

57165 Commits

Author SHA1 Message Date
Thomas Hartmann
26b16e52ab QmlDesigner: Add icons for AnimatedImage
Change-Id: I11878b08262187cabdc818eb3ff7936a730513bc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-08-29 07:57:31 +00:00
Ulf Hermann
8ef4964168 QmlProfiler: Don't scan the whole file system in rewriter test
QLibraryInfo::location() returns one string. Iterating over that gives
us the individual characters, beginning with '/'. Running that through
FileName::fromString(), gives us "/", and feeding this to
ModelManagerInterface::importScan() is not funny.

This has to be backported as the sheer volume of files to be scanned
makes the tests time out.

(cherry-picked from commit af8bd12387)
Change-Id: Ib4293437ab83da8ed10a696fba2c30f5c51c8124
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-08-29 07:34:26 +00:00
Christian Stenger
b5b366f562 Debugger: Fix possible nullptr access
Change-Id: I8a764375f3d62f644b4621d41d82afbcdbdd9415
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-08-29 05:50:38 +00:00
hjk
893146b8b6 Debugger: Split ToolTipManager into per-engine parts
Change-Id: If2e601a91ad2a0e5ba30916a5d1f2312ecff944f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-28 14:14:21 +00:00
Christian Kandeler
faccb8fd71 qbs build: Fix highlighter engine autotest
We link against the TextEditor plugin as of 601eebd832, so don't pretend
anymore that we are the plugin.

Change-Id: I8afdce57ceffdcbf965e16e7a24c0a9ab6d7d234
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-28 13:06:32 +00:00
Leena Miettinen
e1e1790402 Doc: Update locator information
- Use QML code in examples and enable the hiding of
  C++-specific information by using defines.
- Update screenshots
- Update info about "Filter Configuration" dialog

Change-Id: Ia2ca4220a46308c6f480965153ac1002f9790054
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-08-28 10:26:25 +00:00
Ivan Donchevskii
efe7c56e62 Clang: Do not add -undef to ClangCodeModel arguments with clang-cl
Clang-cl behaves similar to MSVC and the parsing is more proper
without -undef specified.

Change-Id: Iee37fca3401000edb3e77e8a99dcb85ae6e70ab3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-08-28 10:23:34 +00:00
Leena Miettinen
21b2c1d04a Doc: Update information about checking QML and JavaScript code
The error messages and codes are displayed when you write code.
The JSON information is unrelated and was moved further down the
topic.

Added a screenshot of checking QML code.

Used defines to mark C++ specific parts.

Change-Id: I08a122727200208474036adec56afd6235b56d6a
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-08-28 09:40:47 +00:00
Thomas Hartmann
91a0280394 QmlDesigner: Add alternative shortcut for macOS to reload property sheet
Change-Id: I4e823e39812b06f7131c610a0ac259df722b5b12
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-08-28 09:37:12 +00:00
Eike Ziller
bd59472f40 Perforce: Fix warnings and modernize
Change-Id: Id43718869aaf2bc24e6a6614bcddcc35715502fe
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-08-28 09:04:20 +00:00
Ulf Hermann
75db89d92e Tracing: Wrap pointers we don't own in QPointer
The notes model might get deleted before the renderer.

Change-Id: Ic7b0ee73bd96e63b19e05b1a374baaf28c6f47fc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-08-28 08:57:54 +00:00
Ulf Hermann
3008255bb5 Tracing: Make notes in TimelineModelAggregator mutable
When the notes model is deleted, it becomes null. The notes model
belongs to TimelineTraceManager, not to TimelineModelAggregator.

Change-Id: I0ef9312620e08c06d31bc65976a887af0ca90c33
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-08-28 08:36:45 +00:00
Eike Ziller
93a6dd0c67 Fix editing of custom executable path
When editing the path for a custom executable run configuration, the
text cursor would jump to the end every time anything is typed. This
makes changing a part inside the text very cumbersome.

This happens because the executable aspect registers a "display filter"
that transforms the input to native separators.

Solve that issue generically for the path chooser by resetting its text
cursor position after the path has been set, if the input field has
focus.

Change-Id: Ic0a178e942da8df1e53b5d90c78a5bf1675865c2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-08-28 08:12:12 +00:00
Leena Miettinen
f06f9122d7 Doc: Add screenshots for QML code completion
Use defines to hide C++-specific info from Qt Design Studio
Manual.

Change-Id: Ia1a0f730f8999e5b6f1dfe69779729bb90c46a1d
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-08-28 07:31:17 +00:00
Ulf Hermann
4ecc46626b FileInProjectFinder/Debugger: Use Utils::FileName for sysroot
Change-Id: Id937f927ba6137fd04f742f31d1b260afbe42db4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-08-28 07:27:30 +00:00
Orgad Shaneh
767137157e VCS: Consolidate submit editor actions setup
Change-Id: I36754779b6a9aa35de705b368daf8c2a1de058c6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-08-28 07:26:14 +00:00
Orgad Shaneh
f1f506b479 VCS: Remove unused unregisterActions functions
Change-Id: I4c7a0dfc93f27f93cdbd84d7e027e63db05341e8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-08-28 07:26:02 +00:00
Orgad Shaneh
6e59d31095 VCS: Capitalize commitDisplayName
To be used by the submit editor.

Change-Id: I73fc13abfd37f207d92669c1893b7edda35ed1e4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-08-28 07:20:13 +00:00
Christian Stenger
ff6d91e42b Theme: Fix nullptr access
On close this function gets called with a nullptr.
Amends c79f436e2a.

Change-Id: Ie7c1e8d91fc0ff26208c6f2bbc108f32d47f3608
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-08-27 15:35:10 +00:00
Marco Bubke
b2c3e683cf ClangRefactoring: Add SymbolIndexerTaskScheduler
The scheduler is managing the asynchronous tasks by using the symbols
collector manager. Every symbols collector can be used by only one thread,
so the we have to pass the symbols collector around by the future interface
to make the available again after a task is finished.

Change-Id: Ic2eeaa986c2d93978d043216c46e8cb38cea769f
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-27 13:46:34 +00:00
Marco Bubke
6775347cd2 Utils: Add setUnionMerge to algorithms
Utils::setUnionMerge is an extension of std::set_union. It is not assigning
but merging equal matching values. For example two project part with the
same id will be merged in one by the merge function.

Change-Id: Ia244a7c1ff84dfdbd30f7101ed1ccbfb88393c7d
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-08-27 13:46:21 +00:00
Christian Stenger
cd8cbed287 Theme: Fix missing include
Change-Id: Ibce98ffd867a038fc08d556ceaf7376068663d22
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-08-27 13:24:03 +00:00
hjk
b97e9bd429 Debugger: Make Global Debugger Log off by default
It's more a debugging aid for work on the Debugger itself
than a feature of general interest.

Change-Id: I915019e28df6cf4a5c369ab2de45959943cd4dd4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-27 12:47:47 +00:00
Jürgen Hunold
d2146644a6 Botan: forward QMAKE_CXX_FLAGS from mkspec to configure
Change-Id: Ibc3922a1aa6f09cca0fd7b4360cf283363cda87d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-08-27 11:59:24 +00:00
Ivan Donchevskii
1b4f5c0670 Clang: Fix include paths order
C++ include paths should come before Clang include
folder. Therefore parse all options for include/c++/v1,
include/c++/{version}, include/g++ and /usr/local/include.

Task-number: QTCREATORBUG-20231
Change-Id: I22c41f07d241e1e564069bb192d4fe637ff05e87
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-08-27 11:35:02 +00:00
Christian Stenger
4538227cb1 Theme: Allow compile with Xcode 8
Amends c79f436e2a.

Change-Id: I0c0def4f08412d0ede71c58b8b5a820ea5f902a1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-08-27 10:41:38 +00:00
Leena Miettinen
3b2a7c0b52 Doc: Reflect changes in Qt Design Studio Manual structure
Change-Id: I811c8715e02e8013c7e34c6dbf0b7a1e60205383
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-08-27 09:47:50 +00:00
Marco Bubke
5bd7af7a90 ClangRefactoring: Add SymbolIndexerTaskQueue
A first step for concurrent index task.

Change-Id: I9a0dba9f4a67ee605281516785697045b34e2694
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-27 09:17:39 +00:00
Christian Stenger
8b397d6501 Theme: Fix typo
Amends c79f436e2a.

Change-Id: I211b667b50675b8fa48bdf231146ff7e406f592d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-08-27 09:14:45 +00:00
Christian Stenger
04c39520e9 Debugger: Respect the last perspective
Switching to Debug mode did no more fully respect the last
active perspective, but instead restored it and afterwards
initialized the debugger engine and restored the
respective Debugger perspective.

Change-Id: I5ba34298f463c396b7f73e431efa76be3bcbe6eb
Reviewed-by: hjk <hjk@qt.io>
2018-08-27 09:14:33 +00:00
Thomas Hartmann
f6ddfd6265 QmlDesigner: Add AnimatedImage
Change-Id: Ib7f13c27b2250c9c1447ad4915782cd8050a740e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-08-27 09:02:07 +00:00
Ulf Hermann
33a0ab8943 FileInProjectFinder/Debugger: Use FileNameList for search directories
Change-Id: I8f9fa4631fda26e10e6b21abfcba9e5f74d635c2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-08-27 08:59:11 +00:00
Ulf Hermann
e9de99f84b FileInProjectFinder: Use FileName for local part of direct mappings
Change-Id: I1855e9af95874967a0d3fc9d7a410cac12355ad2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-08-27 08:59:05 +00:00
Ulf Hermann
9bbef89cdc FileInProjectFinder/Debugger: Use Utils::FileName for project directory
Change-Id: I5a3f376bea4ee06c6856e614f6f71974c2f5ca87
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-08-27 08:58:14 +00:00
Ulf Hermann
c56ddc7966 FileInProjectFinder: Use categorized logging
Change-Id: I1fed1821ec0c7a184f093900d0da15be677c8fed
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-08-27 08:58:08 +00:00
Ulf Hermann
7b0b4c92cd FileInProjectFinder: Search DeploymentData for paths
The deployment data is the most reliable information we can get
regarding where a file from the host ended up on the target. Therefore
it is searched first. Since the "directories" found this way may not
actually exist on the host, we return the list of entries rather than
the actual path for those. Files from different host directories can be
deployed to the same target directory, after all. Using the list of
entries, a client can reconstruct children of the directory by appending
an entry to the base path and searching again.

Change-Id: Ia0f72872a4ff6313f1ae8b0f441b67f55be5a456
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-08-27 08:58:01 +00:00
Marco Bubke
6fba0be280 ClangRefactoring: Improve symbol parsing
Declarations are only indexed if their file has been changed and references
has to be indexed if the file or any included file has been changed.

Change-Id: I07c6de1379bce2462c1e0fad34d4378a3da4397b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-08-27 08:51:29 +00:00
Vikas Pachdha
bc3e365e90 Fix infinite recursion
Change-Id: Ice8abb98a15ebcfaaf710db1195e882f542c33f1
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-08-27 08:41:05 +00:00
Jochen Becher
36bb1b6085 ModelEditor: Clear edit focus on exporting diagram
Task-number: QTCREATORBUG-16689
Change-Id: I01fb97e744a813c4f6c8cb2180e4c49cdafe17ec
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-26 15:55:46 +00:00
Jochen Becher
7a3c785950 ModelEditor: Fix scene boundary on export
Change-Id: I93d783b2db7e65f5d7cbab2c7b2367587be320d5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-26 15:54:49 +00:00
hjk
3b5d74c6c4 Debugger: Handle 'raise' operations in dock destruction properly
Change-Id: I19e8eb2ae1d247964ee2a46a35e1990c01e4d6c2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-24 10:16:46 +00:00
hjk
2dc14e9eca Debugger: Fix persisting/creation of debugger toolbar
Change-Id: I212f23ef365a2e12aa78dcf26d097dec95f3189e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-24 08:48:41 +00:00
Eike Ziller
601eebd832 Fix painting of current line in generic and python editors
The generic highlighter and the python editor explicitly map some tokens
to the format C_TEXT. Unfortunately this format is special, because it's
foreground and background colors are handled by setting the editor's
palette, and should not be used for setting the format on characters.

If the format is explicitly set on characters, their background will be
oblique and overpaint e.g. the highlight for the current line, which
looks pretty ugly.

Handle this directly in SyntaxHighlighter::formatForCategory for all
syntax highlighters, by returning an empty QTextCharFormat for C_TEXT.

Change-Id: Ifaeb556754ca8106ad6e55d7062b13b45457a809
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-08-24 08:15:21 +00:00
Morten Johan Sørvig
c79f436e2a Improve macOS dark mode support
The current theme support in Creator works well, also
in macOS dark mode. This change makes sure that the
native macOS appearance setting (for the Creator process)
and the creator theme setting are in sync.

This is required to avoid light/dark palette issues for
the light Creator themes when the desktop is configured
for dark appearance.

Add a “DarkUserInterface” flag to the creatortheme files.
This flag indicates if the theme is overall dark, with
light text on dark background.

Make setCreatorTheme() force the standard light aqua
appearance for light Creator themes.

Change-Id: I1a5c183230ab0e66641fd834df19d7e0ad1b6a53
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-08-24 07:50:25 +00:00
Morten Johan Sørvig
389fb7f060 FileUtils_osx -> FileUtils_macos
This matches other macOS naming in Qt.

Change-Id: Ifd6b9b173992a4c096c83733194493f4a2292adf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-08-24 07:50:07 +00:00
hjk
fd25bbd99d Debugger: Re-enable breakpoint enabling via gutter context menu
Task-number: QTCREATORBUG-20970
Change-Id: Ie8fc2af8e99e82018a9b4262fe6053cb714e7d60
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-08-24 06:20:06 +00:00
Ivan Donchevskii
6652d937aa Clang: Fix excluded Clang path regular expression
Cover cases like /usr/lib64/clang/6.0.0/include

Change-Id: I015ea3535637376eeab6f737752ad13d33887190
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2018-08-24 05:46:07 +00:00
hjk
468e71cbe4 Debugger: Remove two unnecessary captures of 'this'
Change-Id: Ic3bfa3d0539974087d08153a66a80f29a6ff8257
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-08-23 15:20:32 +00:00
Christian Stenger
c03e5aebe0 Debugger: Fix typo
Change-Id: I16be2a69d0050e27b908bff4991dfb11e9dfd25e
Reviewed-by: hjk <hjk@qt.io>
2018-08-23 14:57:43 +00:00
hjk
4b7a9ae5db Debugger: Replace Internal::mainWindow
... by DebuggerMainWindow::instance() and clean up a few uses.

Change-Id: I7ae4073aa97fc2f00108533bed91db330b07880f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-08-23 13:55:56 +00:00