Commit Graph

36041 Commits

Author SHA1 Message Date
David Schulz
3ed88cda2f GenericHighlighter: Update supported kate styles
Change-Id: I016b25c56b31c615e208e86e690fc7408c9e5384
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-07-25 06:24:54 +00:00
Eike Ziller
e8e46ab553 Plugins: Fix that mimetype definition was not valid JSON
JSON officially does not support multiline strings, so we should use
the same mechanism that we already use for the plugin description
(i.e. additionally support arrays of strings which are interpreted
as lines).
This just happens to work because Qt's JSON parser eats it without
choking.

Change-Id: I25ef04600b209775c5a7af916c687fda4a8b1a4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-25 06:00:49 +00:00
Alessandro Portale
5df0f97d2f Core: Tweak the wizard icon text overlay
Increasing the text size a bit, making the text darker and making the
margin proportional to the image size (resolution independent).

Change-Id: I029b57e2bf1c355f35161e5f8810dddea4114047
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-24 18:03:34 +00:00
Alessandro Portale
8997386675 QmlDesigner: Polish the formeditor split toolbuttons a bit
This gives them a similar look of other toolbuttons
in Qt Creator.

Change-Id: Ib3163ff6c1eab2bd26e46d1136de5fa474dea66d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-24 17:48:34 +00:00
Nikolai Kosjar
c3ce2dc063 Clang: Sort files in *.pri/*.qbs
Change-Id: I284298c926f3d445272987ee622e6fc4aba4697a
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
2017-07-24 15:58:59 +00:00
Alessandro Portale
9113125a5e Wizards: Add file extension as text overlay to some wizards
Change-Id: Ibfd1144271c4381c7125db80713cbde431a54cf7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-07-24 15:32:24 +00:00
Alessandro Portale
5a0d7a0abd Core: Enable text overlay for "New File/Project" icons
Change-Id: I6f206b2c97f7435b4de3a06c32b3933f3519181a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-24 15:26:57 +00:00
Orgad Shaneh
257bf341ca GccToolchain: Minor cleanup
Change-Id: I9bf2d935bf95ff45b29ebfbefd8f8aaf8e22e3ac
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-24 15:10:20 +00:00
Orgad Shaneh
948fad02d1 Git: Recurse into submodules on grep if applicable (Git >= 2.13)
Change-Id: I5028d6a46749b22cc0e0f5707c9e283126511902
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-24 15:10:15 +00:00
David Schulz
e97ff9f739 Clang: Do not warn about unhandled enum values
... in switch as long as there is a default case.

Change-Id: I584660cb26ee03a9ce3e41b297af0093dce59d1f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-07-24 14:21:36 +00:00
Marco Bubke
05a77a39a1 Clang: Make C++17 default for clang queries
We don't want users to stop to use new features.

Change-Id: I7c63f236a8c0059e6db6904b7ceef4d78da6cf42
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-24 13:38:20 +00:00
Marco Bubke
9428624fc1 Clang: Tool tips for clang query diagnostics
If you hover a diagnostics in for a clang query you get now a simple tool
tip.

Change-Id: I6352dd3d4b9a33c183e69037eac903469b90eea4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-24 13:37:18 +00:00
Nikolai Kosjar
6b2d6e7965 CppEditor: Cancel waiting for use selections if revision changed
Not sure whether this can happen at all, but if it can, we should not
make the UI unusable.

Change-Id: I1a40630d0c1f057e20a33b2c755e1fd5aea0b003
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-24 13:24:31 +00:00
Robert Loehning
4335f1184e Core: Replace guards by assert
Change-Id: I116d7fece2a96dbfc9adad0905bc08d8ea4ca40e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-07-24 12:36:48 +00:00
Christian Stenger
b4ca318383 AutoTest: Improve test results summary items display
Instead of letting warn prevail over pass and fail over
warn just add warn as additional visual marker at the icons
and keep the original test result.

Task-number: QTCREATORBUG-18311
Change-Id: Ia67288fa84598b02c20fc1019799b1bb9282d63e
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-24 11:05:21 +00:00
Christian Stenger
625129d29c AutoTest: Fix appending test results with the same name
If two test cases had the same name but came from a different
executable the results pane still might have shown any later one
(badly) cascaded inside the first one. Avoid this by providing
an additional unique information (the respective executable for
the test case)

Task-number: QTCREATORBUG-18502
Change-Id: Ib071e389758b6269a9a90cc4c4afbcf86ca583ac
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-07-24 11:05:08 +00:00
Orgad Shaneh
f073c39b86 Git: Minor cleanup in grep
Change-Id: I2a686b6f56947d3fbb6dc70757e539bf4f274bff
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-07-23 20:24:28 +00:00
Thomas Hartmann
561a50e3a1 QmlDesigner: Increase the size of resize handle
This makes it less likely to accidentally move an
item instead of resizing  it.

Change-Id: I6102a05c50a68d50ea9e4a316f48089186b3a373
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-21 14:04:33 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
bfe50832b5 QmlDesigner: Fix crash
Change-Id: Ic6c1b8aae4f7bfe77aabaa6d55f04ef2730c7f4f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-07-19 09:02:34 +00:00
Eike Ziller
71b78e1085 Help: Remove workaround for fixed Qt bug
QTBUG-26593 is fixed since Qt 5.3.2. The bug lead to e.g. the mouse
cursor not changing it's shape when hovering over links.

Change-Id: Ib8d2188cbbe87592217f4159286f38bc1c6f2b28
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-07-19 08:03:08 +00:00
Claus Steuer
d105ac8255 CMake: Fix "CMake configuration changed on disk" dialog
The dialog is shown when the cmake configuration changes.
The user can either apply the changes or reject them. To determine the
decision of the user the return value of the dialog is evaluated.
This is wrong because the dialog uses custom buttons (see documentation
of QMessageBox::exec). As a consequence the configuration is never
applied.

Use QMessageBox::clickedButton to determine the user decision.
Additionally change the role of the apply button from AcceptRole to
ApplyRole as this better matches its intention.

Change-Id: I1d2d1fb7186dcc8d789c192c51bb34111eb84ee5
Task-number: QTCREATORBUG-18292
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-19 04:31:02 +00:00