Commit Graph

44854 Commits

Author SHA1 Message Date
hjk
7de7eb6bca Debugger: Work on WatchModel performance
Don't instantiate repeating boilerplate item data in some
cases (such as large arrays).

This makes it necessary to access parent WatchItems in
a lot more cases than before and needs another separation of
WatchItem/WatchModel code to keep the dumper autotests
in a functional state.

For a plain std::vector<int> with 1 mio items this reduces
 extraction time from more than 2 minutes to about 3 seconds.

Change-Id: I175c5f6ee90434a6e85342d8bb71bd10a04dd271
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-01-06 09:59:11 +00:00
Alessandro Portale
768b775f52 Debugger: Continue icon with clockwise pointing arrow
instead of counter clockwise.

Change-Id: I266b4d07c08dc3b8721cad7eccb19657fbb69388
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-06 09:10:58 +00:00
Yuchen Deng
1eb5159a29 QBS files: fix modelinglib build on Windows
Change-Id: Ifcfe529e239f92a787997778b61c8efcdaccef1d
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-06 08:03:09 +00:00
hjk
ef5c105944 BareMetal: Use ArgumentsAspect in run configuration subclasses
Change-Id: I1d83ec427c5f249836c3a727e4b4fa0465fe970c
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-06 07:25:26 +00:00
Alessandro Portale
daab642100 QML project Wizards: Add Qt 5.6
Change-Id: Iaf56de6330c65f71c936dec0b98d9e2331a17da2
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-01-05 16:47:59 +00:00
Orgad Shaneh
e724380951 Qbs: Avoid double call to a virtual function
Change-Id: If0bae8b2c8cce6542cbd6fd8df867fc200feb37d
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2016-01-05 16:46:57 +00:00
Robert Loehning
ef39a087c7 Squish: Remove workaround for fixed bug.
This completes the revert of
commit 89d8693107.

Change-Id: I359ce87b0d29dc242c9ee9d7c04e025859ff5b31
Task-number: QTCREATORBUG-15456
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-05 15:36:58 +00:00
Orgad Shaneh
4f95c5d607 Debugger: Replace newline with space in status message
Just removing newlines produces strange messages like:
"Cannot access memory at 0x1a2a3948Continuing nevertheless"

Change-Id: Ifca25bc14f4c10fc560066172f555a6f475af375
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-05 15:32:55 +00:00
hjk
31eb7c203d Debugger: Add dumpers for some of libc++'s std::{set,map,multimap}
At least for simple key/values (int etc)

Change-Id: Ib60017347a9f28f1994f7db78c0607f3fdbfac2e
Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-05 15:20:51 +00:00
Jochen Becher
a2de97b1b7 ModelEditor: Define syntax of custom definitions like QML
The new syntax is not exactly QML but very similar.

Change-Id: Id08a73cd26923a146429282809f2a5cc6f201d39
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 15:02:58 +00:00
Jochen Becher
86af674e5b ModelEditor: Make item names in-place editable
Change-Id: Ie686e570307dcc4a980174c6b07ce5d8b7929334
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 15:01:08 +00:00
Jochen Becher
e3d0a38bfa ModelEditor: Make keyword static known to class member parser
Sometimes my brain is a junk room where I found the most wondrous bugs.

Change-Id: Ic3a29152fed564d405ee1251ff69ee57cf10ae36
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 15:00:24 +00:00
Jochen Becher
6e1c70357c ModelEditor: Show class members on diagram automatically
When a first class member is entered for a selected class
the members are automatically shown on the current diagram.

Change-Id: I339df96f5aff165508e890fcda48e7078a859e18
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 15:00:10 +00:00
Jochen Becher
81805d8a28 ModelEditor: Improve class members parser
The parser of class member source accepts new qualifiers,
some more Qt keywords and member initialization.

Change-Id: I4ebff8f13f856527a1d4fcc168207c50ae43b147
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 14:59:58 +00:00
Christian Stenger
8e3d25290e Enhance test tree model and item to support gtest
Change-Id: I982edc1e390623fa9935d8f70fc29474f56ecac5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-05 14:51:43 +00:00
Christian Stenger
42def5bb05 Add basic support for gtest
This patch provides the basics for detecting the googletest related
code.

Change-Id: I34da3e02596cdc0805f79633ecf2176807390fc1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-05 14:51:31 +00:00
Alessandro Portale
e8181da0e2 Qt Quick Designer: Support "import QtQuick 2.6"
2.5 was the maximum, till now. Qt 5.6 comes with QtQuick 2.6.

Change-Id: I110399539992423684ecd270e172cc3605123683
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-01-05 14:48:07 +00:00
Marco Benelli
e0f2dc77b0 QmlCodeModel: fix FakeMetaObject::toString .
FakeMetaObject::describe and FakeMetaProperty::describe used to print
booleans as '000' and '001'.  Now they are printed as 'true' and
'false'.

Change-Id: I1deb6e614d062146989a9acf10a20a1f7ce48560
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2016-01-05 14:16:26 +00:00
hjk
8db4aed945 MacroExpander: Remove unused typedef and member variable
Change-Id: Ia4c501c6a6d0d56a47493d2bdaccfc9b3499e620
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 13:33:08 +00:00
hjk
c04361995a KitInformation: Add 'override' in derived classes
Safer to refactor.

Change-Id: Ie52e08836c0fedd4fbad425163d17b1965a3c1f1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 13:31:50 +00:00
hjk
e36662e97d MacroExpander: Remove tracking of 'invisible' variables
The 'invisible' flag is only ever used in the VariableChooser,
which iterates over visible descriptions. Not registering the
descriptions of the unwanted variables serves the same purpose
and simplify the code.

Change-Id: If5c38bc9b61ca66dae5068983181ec1a85a2c8e6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 13:31:39 +00:00
hjk
8b847bcf19 Debugger: Do not abort debugger on "Engine Ill" for coredump
Even without the stack, the user can find interesting stuff by exploring
the memory, globals etc.

Change-Id: I867d26b09a45425d97c4f3ef6d0528074c25e75f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-05 13:31:15 +00:00
Tobias Hunger
c943ab2d30 CMake: Convert open project wizard to Qt5 style connects
Change-Id: I20dd8ef450883eb559def9b3348d807981a52048
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 13:03:57 +00:00
Tobias Hunger
11aff016fd CMake: Convert BuildSettingsWidget to Qt5 style connects
Change-Id: I8471196f08f99084dcd3b8173f4528ed6d3e305f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-05 13:03:04 +00:00
hjk
11e9e0e330 Debugger: Fix magic dumper debugging aid for LLDB
Change-Id: I665e6bc7b8898d09043cb0b73cabdb98f55668eb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-05 12:46:00 +00:00
Andre Hartmann
2a59bd6514 Gdb: Use 'C' format for variable printing
On Linux systems, GDB may produce localized output of
float/double variables, which inhibits changing the
display format in Creator.

Task-number: QTCREATORBUG-12800
Change-Id: Ic042979c78319ff029f08a8766c8719c46052374
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-05 10:46:03 +00:00
Yuchen Deng
a759fb509a Clang: Fix wrong library import on Windows
Change-Id: Iceab41ad8d8a680de39c455aba6961842a34183c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-01-05 10:41:07 +00:00
Yuchen Deng
856370b61b Clang: Fix libclang depends detect on Windows
Change-Id: Ib29a193ccfa177cbfbd0f4e8111aeb2f754dddb6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-05 05:15:46 +00:00
Yuchen Deng
fc6a0c68a6 Clang: Clangbackendipc build fix
Change-Id: I750521cca5e101e679b79cf45f995f5cca8f07bb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-05 05:15:24 +00:00
Andre Hartmann
8d336756ee Git: BranchDialog: Remove unneeded copy
Change-Id: Ice31081fa11f73fa1e13287dcd3935c88b207b65
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-04 18:24:25 +00:00
Andre Hartmann
61a87799a3 CustomParser: Add warning parser and output channel filter
There have been several requests on the mailing list or the
bug tracker to support parsing warnings for alien compilers
(sometimes slightly modified GCC).

Instead of natively supporting every compiler, users of less
frequently used compilers should use the custom parser to
parse errors and warnings.

The output channel filter for error and warning parser allows
to scan standard output, standard error or both channels.

Also added tests for twisted capture positions.

Task-number: QTCREATORBUG-11003
Change-Id: I5a5bd6f88cf21cde1c74962225067d4543693678
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 17:54:30 +00:00
Robert Loehning
a9ffcbcf89 Squish: Update project tree for qtcreator.qbs
Change-Id: I94ba5523fbbd715e44b228f2936148825ad43c94
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-04 15:46:13 +00:00
Oswald Buddenhagen
68f5420093 report errors from projects included by cumulative evaluation
so far, we would suppress any errors which occur during the (exact)
evaluation of projects which were included only by cumulative evaluation
of a parent project (see f53d37d48). this makes sense, as excluded
projects are likely to fail, producing unsettling noise on the way.
however, having no indication at all why a subproject failed to load is
not helpful, either. so print these errors, but tag them with a prefix.

note that we continue to suppress messages from the cumulative
evaluation of all projects, including from the exact evaluation of .prf
files done even in this mode. this is done because this output is
expected to be quite noisy and unhelpful. however, it can be argued that
this isn't a wise choice for projects which are known to likely fail for
reasons which would not impact our ability to show (an approximation of)
the project in the project explorer. for the time being, we assume that
the expected errors occur later on (typically during the .prf evaluation
phase due to unknown QT entries), so an unexpected error which would
also affect the cumulative evaluation is displayed nonetheless.

Change-Id: Idc2675744169b7cb52c0542a80075850e2b9317c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 14:28:09 +00:00
Oswald Buddenhagen
33ad0f1031 report to message handler whether evaluating cumulatively
we evaluate prf files precisely even when the pro file is evaluated
cumulatively. the message handler should know the mode a message is
reported in.

this just syncs up with qttools/08d0cb6f8e90a818bf6d3bec7a6d00f16419b8c0
and qttools/ea1a5c3534f089c0e704808a0fb029eda8f753b4 without
user-visible effect.

Change-Id: Ia14953a5a9dc31af56ad6c338017dd5b85bb4494
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-04 14:27:55 +00:00
Oswald Buddenhagen
4996eb3433 make CONFIG feature evaluation failure non-fatal in cumulative mode
while we evaluate the features themselves in precise mode (which is the
reason why they can error out), we do not want them to terminate
cumulative project evaluation.

Change-Id: I70f3e1bcb2ca04a70c74ff484749ca92c1cf6372
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qttools/90ee4094161b427c32581bca2f5286edb4fffdb1)
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 14:27:38 +00:00
Oswald Buddenhagen
5a7d3e78db Merge remote-tracking branch 'origin/3.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ifbe181e86c161e082cc9a69a4bc7bd399f34ff47
2016-01-04 14:11:07 +01:00
Andre Hartmann
dbc49a32b8 GenericProject: Wizard: ignore .user backups also
Change-Id: I35e4ee4204d2595158f5630444dba184a6cbeebd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 12:57:35 +00:00
hjk
8e702387e5 Debugger: Start separating different process environments
Debugger and stub run locally, the debugged process not necessarily.

Change-Id: Ibf6aec3dcaec60069866ec0765ec2178ca0a26d6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-04 12:33:47 +00:00
Jochen Becher
36b3e3c897 ModelEditor: Sort toolbars by priority
Change-Id: I7b8adca90cb0956c0af7aec454b9e62df98e8ba5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 12:19:39 +00:00
Jochen Becher
eb38644e9f ModelEditor: Replace long lambda with method
Change-Id: I9e530efad4c0f96c76e1bcdb95b9a8e1b5c52de6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 12:19:27 +00:00
Jochen Becher
b13f964fd5 ModelEditor: Set global context for parent-diagram action
After selecting a new diagram from the pop-down menu the
open-parent-diagram action was not immediately available
because the model editor context is no longer the active one.
With this change the action is registered in global context.

Change-Id: Icf6fc0408916a3e22d2f19e7a09ab24fcf20a867
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 12:19:06 +00:00
Jochen Becher
a943717ceb ModelEditor: Fix alignment lines
Alignment lines (pressing Shift during dragging of items) only works on
moving not resizing elements and has some problems with showing correct
position and pressing Shift without moving mouse.

Change-Id: I0b534cfcb8aff6df2cb50d1b23456bfccb39f073
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 12:18:53 +00:00
Jochen Becher
d060b9734b ModelEditor: Encode class member declaration in HTML
Some special characters in member declarations (like '<')
must be translated to HTML ('&gt;').

Change-Id: Idb82945e494e9b650e3158dbd5169799dfd81170
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 12:18:19 +00:00
Jochen Becher
9c6262124c ModelEditor: Support model specific customization
If the model contains a configuration path to a configuration file
(or a directory of configuration files) the configuration is loaded
for that model only. The file path may be relative to the model file.

No UI support for this feature yet.

Change-Id: Ia3615da3e57fc4731926a5970ba1b2f741d64e21
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 12:18:09 +00:00
Orgad Shaneh
f4545031f9 Qnx: Fix GCC 5.2.1 warning in release build
warning: 'stateToRemove' may be used uninitialized in this function [-Wmaybe-
uninitialized]

I know it doesn't make sense...

Change-Id: I26239fc58ea238f835cc88501e89e682ad402e85
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 10:55:24 +00:00
Orgad Shaneh
e9cffc1b74 Clang: Fix auto-detection of gtest/gmock on debian family
The source files are in /usr/src/g{test,mock}, the includes in /usr/include

They were also swapped.

Change-Id: I2a9ad84f8d29a0873a4e568f4b21a198c70d948c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-04 10:53:50 +00:00
Andre Hartmann
af9c1b3d6c GenericProject: Remove duplicate and unused constants
The same constants appear in projectexplorerconstants.h,
from where they are used in selectablefilesmodel.cpp.

Change-Id: Iedeb30747b80e3d9d14a684d4b480400670bc6e3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 10:43:24 +00:00
Andre Hartmann
bd7f09ac02 GenericProject: Add some const
Change-Id: I9c839a82b99b5d5bb859ae6f478ac553cae443f6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 10:37:10 +00:00
Andre Hartmann
a7b77ab323 GenericProject: Fix line break
The line is short enough to fit on one line.
Otherwise, curly braces would be necessary.

Change-Id: Iaab9ba5b45922a8d41fbdb43d4629863ea19db78
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 10:37:01 +00:00
Orgad Shaneh
bbc5b87bdd FancyLineEdit: Fix initial value of m_firstChange
Gone wrong in 1f8b9077ab.

Change-Id: I76147b36a7fc8ff5cbf8129481d1d32a52c3a7b5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-04 10:30:36 +00:00