Commit Graph

47023 Commits

Author SHA1 Message Date
Ulf Hermann
3a9e459408 QmlProfiler: Relax client manager test
We can actually get several TCP connection attempts from the client
manager. That is the whole point of retrying. The QQmlDebugServer
explicitly allows sequential connections, so we should allow them, too.

Change-Id: Id38290dbfd86fadfb0c648189f89827330ea1174
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-26 08:27:50 +00:00
Leena Miettinen
e67cb6d521 SCXML: Fix UI text
Change-Id: Ic8c0c27c12bcd9992cf3518087c283606f5acdeb
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-26 07:36:21 +00:00
Leena Miettinen
3a9f242afe CMake: Fix grammar in warnings
Change-Id: Iaadab95ffa102c02fe8de70b11dd1dd5ad224520
Reviewed-by: Aaron Barany <akb825@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-07-26 06:50:55 +00:00
Aaron Barany
6d3497d4e2 QBS DefaultPropertyProvider: Separate C and C++ compilers
Task-number: QBS-893
Change-Id: If811a34d6fecba8989b19089e8bac5df5621836f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-07-25 18:41:18 +00:00
Nikita Baryshnikov
0598202d3d DiffEditor: do not show reload prompt
for text document, after reverting some change in diff editor

Change-Id: I3511f00e52beffba1cce67fb6940d1b580ef99cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
2016-07-25 14:01:26 +00:00
Jarek Kobus
adbc3f611f Show proper diff when one of diff files is missing
Task-number: QTCREATORBUG-16540
Change-Id: I185ac8e7c8be364c1e2f74bfe0af6f9e393c89be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-25 13:29:10 +00:00
Jarek Kobus
3c1647e6b2 Refactor DiffEditorWidgets, introduce common widget controller
Reduce code repetition.

Change-Id: I416555dd83ce888088a6a259777c294a6feb35f4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-25 13:28:45 +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
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
Leena Miettinen
41e336f9d7 Autotest: Fix project wizard text grammar and capitalization
Change-Id: I0f3f6ff92200760d4a226bf34a8fd10ca9d8cbf2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-25 09:13:56 +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
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
Thomas Hartmann
f433247dd6 QmlDesigner: Fix regression caused by styling
The highlight for changed properties was broken for combo boxes.

Change-Id: Iaf345f2c4b0a246588a58b970cb7927004a73774
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-22 13:29:13 +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
Christian Stenger
d8c18de93c Tests: Fix compile with Qt5.5/MSVC 2013
Change-Id: I60b7222380486c965701abf6fcbfad460797ab27
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-22 12:06:58 +00: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
Leena Miettinen
116baad641 Doc: Edit the changes file for grammar and style
Change-Id: Iea26aa7112e43694df244dfbbfe61846d9477126
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-22 10:44:03 +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
Robert Loehning
e9570bd87c Add missing updates in README.md
Change-Id: Iee6fa9e19b288151095f4dbdb9aabc2b15e132f7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-07-22 09:12:55 +00:00
hjk
539e33da02 Debugger: Improve QObject related dumpers in release builds
Make QMeta* dumper work without debug info.
Show QObject parent and children list in this case.

QObject properties are not visible, and neither actual type
of QObject children.

Change-Id: I05417a7d78084234403a964f683db6867b6686f0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-22 08:22:03 +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
David Schulz
16ca70994b Clang: Fix assert in code completion test
Assertion failed: IncludeBriefComments == this-
>IncludeBriefCommentsInCodeCompletion, file C:\dev\src\llvm-381\tools
\clang\lib\Frontend\ASTUnit.cpp, line 2337

Only occurs when linked again a debug llvm.

Change-Id: I6a37875fe95852ee2afcef7f6b6b38e9669a6584
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-07-22 06:35:46 +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
Tim Jenssen
b63f98a592 QmlDesigner: fix warning if colorLogic does not exist
The idea that these spinboxes should be a mashup
with a slider was never completely implented.

Change-Id: I049f0db595fcce0fb59fad550ceb1a4ca2b415bb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-21 12:18:31 +00:00
Alessandro Portale
23168e93ae Flat Light Theme: Improved visibility of progress bar #2
The progress indicator does not have enough on the progress bar
background. This change increases the visibility by making the
background brighter, and conforms the success green with the run green
and error red with the stop red.

Task-number: QTCREATORBUG-16634
Change-Id: Icb1e5744b0ad59e9a11d35e6e8f8048326404cbd
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-21 10:26:57 +00:00
Alessandro Portale
592dd9ecb7 Flat Light Theme: Improved visibility of progress bar
The progress indicator does not have enough on the progress bar
background. This change increases the visibility by making the
background brighter.

Task-number: QTCREATORBUG-16634
Change-Id: I35562e794e8787b6fa6016ceadafc91ce3906d5a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-07-21 10:17:17 +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
Tim Jenssen
0a72e887aa QmlDesigner: add missing checkers.png
Change-Id: Ifbf3d13f8e586fcc3cbd284f2c23e99b10401c39
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-07-21 10:12:38 +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