Commit Graph

54723 Commits

Author SHA1 Message Date
Thomas Hartmann
a4cb8479a3 QmlDesigner: Fix flickering move cursor
The check for selectedItemCursorInMovableArea has to be the first check,
because otherwise we might change back to the selection tool if e.g.
the item list is empty. This leads to a flickering cursor and bad
usabilty.

Change-Id: I0ea82cd1c4bf83cde0b173ab08f19bd04b1128c0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-21 14:04:20 +00:00
Tobias Hunger
d8e0ecb0ab CMake: Extract crossReferences data of targets in server-mode
Use the information to add a filenode below a target that takes
you directly to the target definition.

Change-Id: Ifcb8e2c4f085110033019ea3816c79f5b8630472
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-21 12:49:16 +00:00
Tobias Hunger
7afae6b4fd ProjectNodes: Allow to specify a list of extra locations for FolderNodes
This is useful for buildsystems to provide quick access to interesting locations,
e.g. related to the targets they define.

Change-Id: Ia23534ccaf15ae63b38354c563907c594ad6879c
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-21 12:49:07 +00:00
Leena Miettinen
214f87b69b Doc: Describe renaming files when renaming symbols
If the symbol is a class, and filenames contain the symbol,
Qt Creator also offers to rename the files.

Change-Id: Iba467cc4bf5ec6d4098973c9d391ffaff2f3bc4b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-21 12:20:58 +00:00
Jochen Becher
91dec7fe7a CppEditor: Minor refactoring quickfix
Change-Id: I978d79f081749cef58ca9be7387892dbca71683c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-21 11:54:23 +00:00
Nikolai Kosjar
a6aa287720 C++: Fine-tune auto insertion of '}'
Do not insert for these cases:
 * <Cursor>{
 * namespace X <Cursor>
 * if the next block is indented, like e.g.:
     if (e) <Cursor>
        g();
 * on empty line if text before looks like a finished statement or
   scope opening/end

Change-Id: Id9decc1e964a775724a929c2a3e79b5283105560
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-21 11:42:46 +00:00
Nikolai Kosjar
2c9feb1f4b C++: Add tests for MatchingText::contextAllowsAutoParentheses
Change-Id: I4c2bdf55112f473770db1515bd412215685bfe04
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-21 11:39:32 +00:00
Nikolai Kosjar
a82c47d307 CppEditor: Remove invalid QTC_ASSERT
This can be triggered by:
  1. Put the cursor on some identifier
  2. Type some e.g. a-z character and trigger Ctrl+Shift+R as fast as
     possible

Typing the characters modifies the document and triggers the
CppUseSelectionsUpdater asynchronously. The result comes in when we are
already in local renaming mode, thus the assert triggers.

Change-Id: I4ae7b2b4c259b3b1ef637f5272b0bda06b6db2ec
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-21 11:38:58 +00:00
Eike Ziller
846a92f387 Merge "Merge remote-tracking branch 'origin/4.3' into 4.4" into 4.4 2017-07-21 08:25:36 +00:00
Eike Ziller
2b0ea32f0c Merge remote-tracking branch 'origin/4.3' into 4.4
Change-Id: I1c28caf86ad36c371cafb60527cdaceb25d633c5
2017-07-21 10:25:21 +02:00
David Schulz
698e323a73 TextEditor: Make annotation position configurable
Change-Id: Ib59c9770390523e1863ac507ce43512ba679c591
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-21 08:25:14 +00:00
Leena Miettinen
2a06ec7da3 Welcome: Add links to the new video tutorials from Tutorials tab
Change-Id: If38ff8abd3ddedae7cd368bc67d533dfeff22208
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-21 08:17:18 +00:00
Eike Ziller
1feb5c604d Merge remote-tracking branch 'origin/4.4'
Change-Id: I02e54f45d233b89ddaee9c87da9b9af2a56374b8
2017-07-21 10:08:05 +02:00
Alessandro Portale
e65d4c6f65 Wizards: Make the big wizards icons smaller
The feedback was clear: Icons were too big. This patch decreases
the sizes from 92x68 to 48x48. 48x48 should not be too big anymore,
and at the same time it should still allow to have an understandable
image.

Change-Id: I45a9f2214a43987ed60d2bd7527c025016dde745
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-21 07:49:00 +00:00
Alessandro Portale
e8477cf248 Git: More visible reset icon in GerritRemoteChooser with light themes
The _TOOLBAR variant of the icon has almost the same color as the
background in light themes and is therefore not suited, here.

Change-Id: Ifc28bfca2f8c0764f0bc507dad63d8936727f610
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-21 07:48:26 +00:00
Leena Miettinen
52c2891083 C++: Remove full stop from check box label
Change-Id: I0129e6902d236f8fbc4216ae882abec349739a34
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-21 07:40:57 +00:00
Leena Miettinen
d785999512 Doc: Describe QML Asset Exporter
...as the chosen tool for exporting designs from Adobe Photoshop
to .ui.qml files. Remove the descriptions of using the old
export script.

Change-Id: Ib09d737c43debcf9773ba9145d66d5f6d91a4c98
Task-number: QTCREATORBUG-18486
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-21 06:57:21 +00:00
Leena Miettinen
8a3c798e4f Doc: Stop automatic linking to macOS
The link target does not make sense in Qt Creator context.
Explicit linking to \l macOS will still work.

Change-Id: I1a77bf87e889a5a6c374e56a1286c0f39d0585a2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-21 06:56:12 +00:00
Orgad Shaneh
c2ecee517e TextEditor: Avoid removing text marks that were not added to hash
TextMarks with empty file names are not added, no reason to remove them.

Change-Id: I8647deaa1136294d2f7c3c63337d967afea675c2
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-21 05:19:18 +00:00
Tobias Hunger
13d3a7a5dc Core: Avoid needless copy of QChars out of a string
Fixes a warning from the code model:-)

Change-Id: I6bb152f8c564f5daabd04ec49d4ce37b8104f056
Reviewed-by: hjk <hjk@qt.io>
2017-07-20 15:11:42 +00:00
hjk
a54cba428a ProjectExplorer: Fix crashes on shutdown
Ensure that RunControls ramp down asynchronously.

Since RunControls now ramp down asynchronously the plugin can
only report synchronous shut down if no RunControl/OutputPane
was present.

Task-number: QTCREATORBUG-18605
Change-Id: Ib8d1f857f85c74d4f18ecb85db537121a2275668
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-20 13:50:31 +00:00
Thomas Hartmann
35c7360892 QmlDesigner: Remove QtQuick.Controls 1.0 dependcy from Window mockup
It is not required and prevents the mockup from working if QQControls 1
are missing.

Change-Id: Ib439bded6dce6b8e0d6f21e9b22f3dad2a6c0d3a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-20 13:34:34 +00:00
Marco Bubke
a31eae4d0a Clang: Add clang query pane
We now support highlighting for an example text and for the query.

Change-Id: I88c415ff871cf3e4c2d4fc83d60a8555bf0ce08a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-20 13:32:39 +00:00
David Schulz
8c4127ebac TextEditor: Improve readability of text annotation
Change-Id: Iddcf6951b44a73cd3e9d740d9aba725fa4d7d663
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-20 13:15:23 +00:00
hjk
a8fa002c4a ProjectExplorer: Initiate proper ramp down if a RunWorker fails
... instead of simply setting the result state.

Change-Id: I6525893b6459fbc07a6da2d036d531101864515b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-20 13:10:29 +00:00
hjk
652d2081ec ProjectExplorer: Do not change state of sibling RunWorkers
... when a RunWorker reportStopped(). We have now always a
"main" RunWorker (again) that is in a better position to decide
what to do with "lower" worker states than the RunControl.

The overall RunControl stopped state meaning is not changed:
It is Stopped if all workers are Stopped (or Done, or Failed)

Change-Id: I04ce6a8cb5b2067ec05fd506f6adc6ca65de0c39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-20 13:10:20 +00:00
Tobias Hunger
816222267e BareMetal: Fix WS
Change-Id: Ib8a2b037ccdfd79602f083a5c52c3702825a6982
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-20 12:46:38 +00:00
Tobias Hunger
7d33f0f061 TextEditor: Initialize some members
Coverity was complaining about these, in some places even rightly so:-)

Change-Id: Ia85cdd2c74f05edba6f0d4534aa9f2ee2a750595
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-20 12:45:53 +00:00
Nikolai Kosjar
c8a543b949 TextEditor: Make TabSettings accessible for AutoCompleters
Change-Id: I3591ad94ca98979c2d47585d33800a489d87eeda
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-20 12:35:10 +00:00
Nikolai Kosjar
f77dfd64d5 ProjectExplorer: Forward-declare TextMark in task.h
...to cut some build dependecies.

Changes to textmark.h affected rebuilding of translation units that did
not seem related, e.g.:

 clangprojectsettings.cpp
   -> clangprojectsettings.h
     -> project.h
       -> kit.h
         -> task.h
          -> textmark.h

Change-Id: I3c1777ecf6579c68787cb4c7e86849b15979b9bf
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-20 12:12:14 +00:00
Marco Bubke
d6bc9a2604 Clang: Add QTC_FORCE_CLANG_LIBTOOLING to force lib Tooling
We don't support different LLVM version but you can enforce them yourself.

Change-Id: Ifdba9170ba96661a9a692154122cdd96f0143df0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-20 11:53:16 +00:00
Marco Bubke
d964df58a2 Clang: Fix clang refactoring enabling
Change-Id: Icdd539c4e537e5aab55943010055c9719dd622fe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-20 11:42:06 +00:00
hjk
9523f1f899 ProjectExplorer: Streamline use of WorkerFactories
Change-Id: I58693457f6441f6992cae61365a58b3d2d933986
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-20 11:39:37 +00:00
hjk
1d682f2144 Debugger: Don't hard-fail on missing Python json module
Only needed for native combined debugging.

Task-number: QTCREATORBUG-18577
Change-Id: I7c5d877b9601e77ab8de251305db829a07675f8d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-20 11:23:32 +00:00
Marco Bubke
578de25d96 Core: Overload the search button activation
The search button was enabled if there was some text in the search term
line edit. If the search term line edit is not used than we need a
different mechanism to enable the search button.

Change-Id: I5b168447c125199920e82d7990dbdd1a85dff1d7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-20 11:16:12 +00:00
Orgad Shaneh
e9aaeb22f8 Refine the creation of a dummy project for the debugger
If the startup project doesn't support the chosen kit, it fails.

Task-number: QTCREATORBUG-18606
Change-Id: I745768e7e9ee1740dadaae05d02dcc45f9e9ebef
Reviewed-by: hjk <hjk@qt.io>
2017-07-20 09:57:06 +00:00
hjk
71c612d07d QmlProfiler: Add display name to LocalQmlProfilerSupport
For debugging purposes.

Change-Id: I6e8006983e30c928ad4cf69f15e627f23741e99d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-07-19 16:01:22 +00:00
Thomas Hartmann
9c2f2bed3a QmlDesigner: Refine selection
This is a major overhaul of the slection logic.
We do not change to the move tool automatically once
the curser enters the selected item. This allows selection
of items that are at the same position as the current selected item.

The selected item can still be moved if there is no pissible candidate for
selection. Also the border and gizmo always allows an item to be moved, if
the item is fully covered by another item.

Change-Id: Ic97a2bf23f33fcc5e209248aeb2f97df67bd23e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-19 12:16:41 +00:00
Leena Miettinen
04f19cf573 Doc: Add info about troubleshooting Qt Installations
Sometimes Qt Creator considers a Qt installation invalid, and
displays an error message. Give users some pointers on what
might be causing the issue and how they might be able to fix it.

Change-Id: I78177fd5a04b6198609ba7cde0867f51db675315
Task-number: QTCREATORBUG-18480
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:42:16 +00:00
Marco Bubke
48b17e341c Utils: Use replace instead of transform
Change-Id: I7399308b93280d1150a24e5729aefc60e1826ea6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-19 11:24:54 +00:00
Marco Bubke
d6d89e3859 Clang: Disable LLVM depend tools if there are no LibToolings libs
Change-Id: Ib30889d75e26916fe02ef10de9f9a20eb8eb893e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:24:35 +00:00
Orgad Shaneh
240d2dc4d4 Git: Fix initial button enabling in Branches dialog
Change-Id: Iad99dd1468457b8de262ee16c4182ac9ff82e0b8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:15:53 +00:00
Leena Miettinen
776df40000 Doc: Describe enabling the ClearCase plugin
The plugin is now disabled by default.

Change-Id: Ifa5fdb8738f5e286fdc43c8d4ee19a793769670b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:12:37 +00:00
Robert Loehning
da904f69f7 QMake project manager: Fix typo
Task-number: QTCREATORBUG-18585
Change-Id: Ia9dccc1f9c19f393ad833c6ffa79ecef824981f1
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:03:30 +00:00
Tim Jenssen
fd5b5fc26f ProjectExplorer: fix warning about casting something to bool
Change-Id: I258a4a2d0a89cd28d6196b8d79a78b94cfc9553c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 11:03:08 +00:00
Eike Ziller
892f33568e ChangeLog: We use the term 'pretty printing' instead of dumper
Change-Id: Icb8ee5853e61f869680a643f3791640e68e7aa1b
Reviewed-by: hjk <hjk@qt.io>
2017-07-19 10:48:04 +00:00
Marco Bubke
b9b69bac33 TextEditor: Disconnect highlighting from text editor content changes
The syntax highligher is connected to the content changes of the text
editor which is not very useful if the diagnostics been provided by
an asynchronous mechanism. So we add a setter to disconnect the changes
from the syntax highlighter.

Change-Id: Ied4b5fe34000b13bafb1aa177b89befe6620d4d7
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-19 09:25:40 +00:00
Tim Jenssen
2f0a395017 Wizards: make get widget a bit more robust
Change-Id: I0182147f517a39c3fdb0f27be4354b30e2cc4f31
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 09:14:49 +00:00
Robert Loehning
19cdb75a8a Squish: Use all lowercase when searching in locator
As soon as an uppercase letter is being
used, the locator becomes case-sensitive.

Change-Id: Id392a762282f824c51a19c26721f820dc3dd3b8e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-19 09:13:22 +00:00
Robert Loehning
f35fd5d79a Squish: Update configuration check in tst_cli_output_console
Change-Id: I0890ce54b76ec8d01095e8ed0c5bbb4dc4f18390
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-19 09:13:05 +00:00