Commit Graph

44349 Commits

Author SHA1 Message Date
hjk
728b914727 CppEditor: Use full tooltip in ClangTextMark
Change-Id: I39cc64acbdbcd5e5156e1514acaf9674a91e81a4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-25 13:25:16 +00:00
Ulf Hermann
b374270ecb QmlProfiler: Don't open the mode popup when testing flamegraph
On macOS funnny things happen if two popups are open at the same time.

Change-Id: Ic83d9e93184fd3f6a5f7e1a8d497da805eeeb6c6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-25 13:23:59 +00:00
Alessandro Portale
fe3f288f27 Debugger: Console: Allow the rows to have individual heights
...otherwise multi-line text would flow over the item.

Change-Id: I98b8a45441150843638f3bd917f5e38f369729f3
Reviewed-by: hjk <hjk@qt.io>
2016-07-25 12:46:31 +00:00
Ulf Hermann
67b176b76f QmlProfiler: Avoid crash on dtor of client manager
Change-Id: Ie4b625a9ae871d56b9d0b59560bfdf6912323b81
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-25 12:21:47 +00:00
Ulf Hermann
8067297edf QmlProfiler: Ignore messages in local runner test
Depending on the build configuration of Qt and Qt Creator there can
be various kinds of messages and we cannot reliably determine their
number in advance.

Change-Id: I162cc02a72200026d3cbe7498fa705911f4cda39
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-25 12:21:19 +00:00
Alessandro Portale
1acec7ceb4 Utils: Get default error color from Theme
The default Qt:red for the lineedit in  Utils::PathChooser is unreadable
in dark themes. This change ensures that the color comes from the
current theme.

Change-Id: I7b890bb18e4b996cf0a8f0ac3286da87dd33f5f2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-25 11:49:02 +00:00
Alessandro Portale
98f7a00e70 Move "Ok", "Error" and "Notloaded" icons from ExtentionSystem to Utils
These icons are useful in other situations (e.g. QmlDesigner)

Change-Id: I31751b8ca8fea34c532d54d423e5fef07b370a4a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-25 11:37:20 +00:00
Christian Stenger
8ce46d80e6 QmlDebug: Avoid crash on socket disconnect
Change-Id: I873b2c84d32498ea4ea2591866d0dff13d59503b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-25 09:04:02 +00:00
Erik Verbruggen
b47b9ea951 QML: Band-aid fix to prevent a crash
If the document that FindExportedCppTypes is to search is not in the
snapshot, skip over it (instead of passing the shared pointer with a
null-value inside).

Change-Id: I462e3d22aa4e1cc51e710c75ae0f9399c151240b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-25 06:22:18 +00:00
Orgad Shaneh
9c72b5bec2 Merge remote-tracking branch 'origin/4.1'
Change-Id: If3b6ebdb2aeb6fabadea1d06a1fe1c9211adcb8e
2016-07-25 07:27:22 +03:00
Orgad Shaneh
a3bdafcbc8 Git: Fix MSVC compilation
Change-Id: Iaf9c168ec2b62abd945a800d3e99a5af9af2b864
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-24 06:44:26 +00:00
Ulf Hermann
6d63ac6972 QmlProfiler: Optimize client manager test
Instead of starting Qt Creator to get a debug server we can just
simulate the hello message on a locally created connection. That is
enough to make the client manager signal "connectionOpened()".

This way we don't get excessive timeouts on this test.

Change-Id: I89fa12b1bdda41a62dec47de042224f26fee79a9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-22 14:10:19 +00:00
Ulf Hermann
15c2b29968 FlameGraph: Make sure the bottom row can be hidden
The height calculations would subtract the second row's itemHeight from
the bottom row's height, which made the second row stay in place even
if the bottom row's itemHeight was 0.

Change-Id: I93479dcef0230e2b722c147e3c8b25484620a11b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-22 12:43:25 +00:00
Tobias Hunger
a185250529 SDKtool: Keep old syntax for toolchain registration working
Keep the old syntax for registering toolchains for new kits
via the SDK tool working.

This should make for smoother sailing for our users, as we can
not foretell which combinations of Qt Creator and Qt installer
(with SDKtool calls) will end up on the machines of our users.

Change-Id: Ib0fb99759ab9dcd75c64c556e18c27e900bf6236
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-22 12:38:43 +00:00
Orgad Shaneh
1b34f2a4b8 Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia90424d479936a898705c433e5810c77ae088b2c
2016-07-22 15:18:00 +03:00
Alessandro Portale
2a765db3a5 Fix text color of progress/find status summary label
Using a themed text color instead of a hard-coded one and making sure
that ManhattanStyle does not tweak it.

Task-number: QTCREATORBUG-16643
Change-Id: I4bac9b29ee3c293270f39438664d617ac7591c8e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-22 11:11:56 +00:00
Alessandro Portale
9ab6228ba0 Use "Source Code Pro" as default editor font on non-macOS
Change-Id: Ie0e8e9de8d2f3761ba033d139c74edab13534e3d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-22 11:11:24 +00:00
Alessandro Portale
4f13735e2b Debugger: Make the console usable in dark themes
This change adds even more stylesheet code to make the background white,
and the editor text black.

Task-number: QTCREATORBUG-16556
Change-Id: I48cf5c825a7600406c289c25ba7c421cd3634a97
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-22 11:11:05 +00:00
Thomas Hartmann
a30b9b6c62 Theming: Do not hardcode the mapping from theming colors to QPalette
There is no reason to hardcode the mapping from theming color roles
to QPalette roles, since such a mapping can be easily defined in the
theme itself.

I added optional color roles for each QPalette role.

Themes that do not change the palette do not have to take care at
all and themes that change the palette define only the QPalette roles
they require.

Change-Id: Id195052c96117b7a1a8d7d7d6acacd44e66e22f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-22 11:09:41 +00:00
Orgad Shaneh
53cbc9d30c Git: Save silently on undo actions
If the user wants to undo, first save the file silently. Then the user is
still able to cancel the undo operation.

Task-number: QTCREATORBUG-16647
Change-Id: I61ac42ff41f3f7758d662692bc92850766beab8e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-22 10:30:10 +00:00
Orgad Shaneh
516161c875 Git: De-noise
* Remove QLatin1{String|Char} where possible
* Use initializer lists for QStringList

Change-Id: I8479f87f4fc909b5d74d854956885564209538e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-22 10:12:59 +00:00
Tobias Hunger
17a34d2458 Fix warnings about inconsistent use of override
Change-Id: Idfb4231f1544e8bb93e6aa31a4503105285e30fb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-22 10:06:46 +00:00
Ulf Hermann
96e877d3ca Qml Inspector: Sort watch items if SortStructMembers is set
Change-Id: I94f3a9c24df52c1a5689ea6e73d81a526d12bdc4
Task-number: QTCREATORBUG-16645
Reviewed-by: hjk <hjk@qt.io>
2016-07-22 07:51:32 +00:00
Ulf Hermann
30eab176fd QmlProfiler: Output unexpected errors in LocalQmlProfiler test
We want to know why it's failing.

Change-Id: I794f183d8aae7f0f7c6444b432d9a2e80db16f22
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-22 07:21:20 +00:00
Orgad Shaneh
03923fc5a2 CppEditor: Add a failing test for move outside class with template
Task-number: QTCREATORBUG-16649
Change-Id: I29c42c23f4dc44b0401fb07c0dc6d0008dcaf096
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-22 06:35:09 +00:00
Orgad Shaneh
44f1d4ff91 GenericHighlighter: Update from latest KTextEditor source
Change-Id: Ic0ede8fce1c1cd1296bdf74f3e8591f138f234ea
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-22 02:57:57 +00:00
Orgad Shaneh
449f7d824e GenericHighlighter: Support dsDocumentation
Use doxygen style for that

Change-Id: Ic1f9c557e2bfa21bb9543448a4f12413ff7bff4d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-22 02:57:51 +00:00
Tobias Hunger
97d80b2785 Gcc: Cache macros after arguments are cleaned up
Task-number: QTCREATORBUG-16422
Change-Id: I0b8bd7cbaf01be98ff8032dd53208db1a1919ed3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-21 15:27:56 +00:00
Tobias Hunger
274d3a8c79 SDKtool: Warn if file is not found
Change-Id: I3f4dd1ec04220ffedfa22f732211f1253d1b2202
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-21 15:21:57 +00:00
Tobias Hunger
396ee16635 SDKtool: Add toolchain language support
Change-Id: I882cc129a603c758369446f947a961ccd2fd4490
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-21 15:21:45 +00:00
hjk
39206931f1 Debugger: Mark out of scope variables as such
At least LLDB reports sometimes out of scope variables as such.
Report them as "out of scope" instead of letting the common
struct dumper fail and report its generic "not available".

Change-Id: Ic9d0d196894ef811fab8e6a586bf55d80cd02e45
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-21 13:29:57 +00:00
Tim Jenssen
6fe82385d6 Revert "Clang: Inline LinePrefixer"
This reverts commit 3ea1eb3631.

not performance relevant

Change-Id: I3e0a4bdf2317c5eec858c7661b2e67fe8028aff5
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-07-21 12:55:14 +00:00
Tobias Hunger
a05332c4d1 SynchronousProcess: Make sure there always is a codec
Task-number: QTCREATORBUG-16628
Change-Id: I037acc37d8e3df88050a3853734c7f4c99e52b6b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-21 12:54:21 +00:00
Tobias Hunger
1063ed3a4a SynchronousProcess: Small cleanups
* Use class, not struct, according to coding style

Change-Id: I3aa14eb9f480d7b07fb015b8694aae6fcc60c169
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-21 12:53:36 +00:00
hjk
ff6251cbe2 Debugger: Fix handling of extra updates on view visibility changes
Using a lambda in the connect was wrong here, as the m_currentEngine
member may change before the body gets executed. Indirect to a member
slot again, which then can use an up-to-date m_currentEngine.

Change-Id: Ice906a31d2ba0655daffda67ae378acc98aa3698
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-21 12:33:42 +00:00
Alessandro Portale
276b20409d Themes: Lighter toolbar borders
The toolbar border/separator lines for flat themes need to be a bit
lighter.

This change introduces StyleHelper::toolBarBorderColor and puts it into
use for drawing all toolbar borders.

Change-Id: Icef20759ce282e768f6ba867474e506b9230b864
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-21 10:17:05 +00:00
Serhii Moroz
887ba52675 Todo: added ability to filter todo list by keywords
Change-Id: I4be35caf461e50e256527ca72993f5d83d08ef3e
Reviewed-by: hjk <hjk@qt.io>
2016-07-21 10:02:14 +00:00
Christian Stenger
a769d2f810 Help: Fix compile for Qt5.5
Change-Id: I8b8063043d5a6be2dc8f9ce1e2e9e36646959050
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-07-21 08:56:37 +00:00
hjk
c94ce7b205 Remove BuildStepList::isNull
It's not really needed. The Null-ness is equivalent to a failed
fromMap() which we execute on all usage paths anyways.

Change-Id: I72bb7fb55b7f26680fa68da8eef751ca96380ecd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-21 08:47:12 +00:00
Tim Jenssen
c25ac73f65 QmlDesigner: reactivate special NavigatorTreeView style
it was a regression when everything switched to fusion style

Change-Id: I87a660afd268ed76608edad8edc93f29db243748
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-21 08:39:31 +00:00
hjk
8a6d8270d2 Debugger: Do not use non-existent working directories for GDB
Task-number: QTCREATORBUG-16497
Change-Id: Ie219189c3b36524bfacce1efa99862398bc6f6e0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-21 06:37:56 +00:00
hjk
6e925910b4 Debugger/BinEditor: Standardize interface
Change-Id: I4acf6bc7648e57c564e86023176ae3905a293a99
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-21 06:20:52 +00:00
Eike Ziller
b2d7d62426 Help: Fix that selecting fallback font style was very limited
It could only handle combinations of "Regular", "Bold", "Oblique",
but fonts can have their own sets of fancy style names.
Actually set the selected style name on the font and save that
in the settings.

Task-number: QTCREATORBUG-16620
Change-Id: Ibf8cd6f2ac0d3ff1c0fd100e9db627937c0eb1ec
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-21 06:12:29 +00:00
Eike Ziller
8c94419a0b Help: Remove unnecessary QLatin1Strings
Change-Id: Ia5c83d5e2c392873f400f3db396b9c355cdd4192
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-21 06:12:22 +00:00
Eike Ziller
c512f5d71f Help options: Fix that font styles and sizes did not adapt to family
Different families can support completely different styles and sizes,
and sizes also depend on the selected style, so these need to be adapted
when changing familiy or style.

Task-number: QTCREATORBUG-16620
Change-Id: I53a2bfb5e867bf7ea66825a9470ff6c9e73b2040
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-21 06:12:17 +00:00
Eike Ziller
6e730fd79c Help: Remove reading of fallback settings from 3.4
Change-Id: I1a029f7cdfd067e5b3c180d9aca889a09c5ae2b2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-21 06:12:08 +00:00
Thomas Hartmann
343d72fd3b QmlDesigner.Navigator: Styling fixes
The Fusion style does not play well with the custom background in
our delegate. I simplified the background in our delegate
and removed unrequired .css code.

Change-Id: Ia3872d7df8b8c031b29199794e509933322c1d98
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-20 21:07:21 +00:00
Nikita Baryshnikov
66142d94d2 Git BranchAddDialog: small fixes
Change-Id: I99910fdb3a646ad818ad58103beb5f63de57ec18
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-20 19:48:25 +00:00
Nikita Baryshnikov
9750a82445 Git BranchAddDialog: fix branch renaming
replace invalid characters with '_'. To allow pasting of text with
invalid chars inside

Change-Id: Ibc0d3dde2252235a931b51ad73ae2eef527be547
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-07-20 19:48:11 +00:00
Orgad Shaneh
9669a84f61 QmakePM: Disable "Run in terminal" for more test project types
Unit test applications do not typically require any input, and
having their output appear in a tab (which also contains history
etc.) is convenient.

Qt Creator disables "Run in terminal" by default for projects
that have `QT += testlib`.

This change does the same for qml test projects, that have
either `CONFIG += testcase` or `QT += qmltest`.

Task-number: QTCREATORBUG-9475
Change-Id: I6da1b239ff1757be4d280f852e7f3537c44867ee
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-07-20 15:59:14 +00:00