- remove useless unique pointer
- remove const when values are changed
- add QVariant include
- explicitly delete the copy constructor and copy assignment operator
so the std::unique_ptr in the map can not copied by accident
(create compile problems on newer Visual Studio Compilers)
565449 introduced it
Change-Id: If10f8191ee9b09c7bcdacd328fb495449b49f219
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
When inspecting logs often enough the relevant information is next to
the line with the unique expression that's easy to match. The `grep`
tool solves this problem by providing various `--*context` options
which configure how much context to show for each match.
This change tries to replicate this feature.
Task-number: QTCREATORBUG-30167
Change-Id: I6432870c0b958df8c5dc616009aea4ca54973245
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
For numeric options a spinbox is added to the popup. The text shown
before and behind the spinbox is controlled via the action's label:
"Show {} preceding lines"
A label with the text "Show " is created before the spinbox, and another
label with the text " preceding lines" is created behind.
Task-number: QTCREATORBUG-30167
Change-Id: Id0fba97c3a674ae41d4ab9d767694f5f5674ef18
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
At this point this might appear slightly over-designed, but when adding
context matching and highlighting of matches the body of the lastBlock
loop will become much more complex. Something you surly don't want to
copy and paste. On the other hand the following changes are way too
complex to mix them with this refactoring. That's what this change
prepares for, and that's why it is separate.
Task-number: QTCREATORBUG-30167
Change-Id: Idb0ed2471006ebaa199acb164043f8fea8fc0d42
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
The texteditor case remains somewhat special as it modifies
the set context after construction.
Change-Id: I8dadeff9177db5281d91f7826f06b994ff132883
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This removes the "Precedes: <resolving>" label when
doing git show on a very fresh, local commit.
The same fix applies to "Branches", though not sure if
it's possible that there is no branch.
Change-Id: I08614d47b229bd04256de1a059876d679cc57b99
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Use LoopList element instead of constructing large tree.
Change-Id: Ie10af350c7ed15a7d06363414174042b65c7ec53
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Drop inner TaskTree and use LoopUntil iterator instead.
Change-Id: I683efb52c3527c36c2cd98e2e2767521817f7d13
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Clean it up before more files are added to it.
Change-Id: I58c531a80718d99d05dc444974e1a4236da8c6cb
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Those will be interpreted relative to the importing product in the
future.
Change-Id: I57f6159053acf1e0334d3289de1f93545e2e871b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
... in the constructor of the relevant AssetsLibraryWidget.
This simplifies the code and ensure the context gets set in all paths
creating such an object. One was missing.
Change-Id: I00daf9ef9f932a35bdc8b2b258c471a655b97fbf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
... and use it to dissolve the DesignerContext as example.
Change-Id: I0b67989050390fd9017203ec48068c144e0b8ac9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
... by providing a way to specify modified implementation
by setting a functor.
Change-Id: Ib0907dd00fdb2ef15242a7ec2e25a5f8a9cc6979
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
The editor context menu generated for the drag mark contains actions
that also gets the same shortcut as the global save command, to make
them visible in the menu. This leads to ambiguous shortcut events if
these actions are still taken into account after closing the context
menu.
Avoid this by removing the actions from the context menu again when
hiding it. This was previously done before the menu was shown again, so
this just does it earlier.
Fixes: QTCREATORBUG-31205
Change-Id: I49490c2d6cbd3b000c717f35373e7f9b6b5393e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This "edit-copy" icon used for source folders is very confusing. The
linked bug report has screenshots comparing Qt Creator and Xcode. Xcode
just uses consistently a folder icon for all nodes that are actually
folders.
This change will make Qt Creator also display a folder icon for the
source folders.
Task-number: QTCREATORBUG-30012
Change-Id: Ibfcc4f55e779ed368edd30bfbc711bd81a4aa499
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
CopyAskingForOverwrite got passed around as value, thus it got copied.
The messagebox results were stored into the fields of such copies, and
therefore had not the expected values across the recursion.
This change wraps the copy helper function into a lambda and the lambda
is passed around instead of the object. It may still be a bit much
decoupling architecture for a single use-case, but it works now (for
me).
Fixes: QTCREATORBUG-31174
Change-Id: I5444d18d7bf4ef59ab879e31e5233eadf1c935e4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
It's conceptionally const, and would be useful to use as such, but
the current implementations often modifie mutable state.
To ease the transition pain, rename the previous non-const version to
addToLayoutImpl() and call it after const_cast'ing.
Change-Id: Ic8ca38e40f5df69c3d11121f96ea37648cf4feb7
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
In some cases there is an excessive number of dot properties.
We need to check for this and filter the number of dot properties.
QQmlPropertyMap cannot handle this number of objects.
Task-number: QDS-13176
Change-Id: Ic0ea2c3c3d77aaab21a3219f8591a421bca3d7ef
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
The menus that are available from the back and forward buttons in the
editor toolbar could show empty items, because some editors are not
backed by files. When they are closed, they are no longer available. For
example: open a file, trigger a git diff (regardless of whether that is
empty), switch a fill times between file and diff to fill up some history,
close the diff.
Just do not show history items with empty display names.
Change-Id: If7e966e55ada407ed03069027b352d12f053751f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
We want to minimize backtracking in OutputFormatter.
Change-Id: I114472d761ddbf0a2c3e6b42c87a531206fb1473
Reviewed-by: David Schulz <david.schulz@qt.io>
... when generating compilation database.
This can happen in session mode.
Fixes: QTCREATORBUG-31186
Change-Id: Ieb081932ac2c562bacae995c7d05a3e0e96c9153
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Amends 104ea4acc.
Hidden friends don't work when declared in the wrong class.
This here happened to go unnoticed as it was nowhere used.
Change-Id: Ie26d5c777c85e143a6b7189ccbd87aedd2502df0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
If qmake -query fails for some reason then %{Qt:QT_INSTALL_PREFIX} would
evaluate to an empty string and CMAKE_PREFIX_PATH will not help CMake
find Qt packages.
By using the path to qmake itself we can safely determine a valid
CMAKE_PREFIX_PATH and CMAKE_FIND_ROOT_PATH.
Fixes: QTCREATORBUG-31194
Change-Id: Ib649dd57bfe3a97ef93a42603d83331922f99612
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Qmlls client was still alive eventhough it was turned off via the
settings page. This was causing both qmlls highlighter and the embedded
highlighter do the job at the same time. Disable qmlls client
appropriately.
Fixes: QTCREATORBUG-31148
Change-Id: I9577a78f9c861cf2fe718ffe58f3d7f77a916b9a
Reviewed-by: David Schulz <david.schulz@qt.io>
