Commit Graph

43591 Commits

Author SHA1 Message Date
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
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
Alessandro Portale
56142b11e7 ManhattanStyle: Explicit PM_ButtonIconSize of 16
This fixes squeezed icons on some Linux Distros with QStyle
integrations, where a lower value would be set and the icons
be squeezed and become blurry.

Change-Id: I2962dd370491fc741646f52a9794e178a2ff81b1
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-04 10:14:05 +00:00
Orgad Shaneh
1e5d6115f0 Clang: Fix GCC 5.3 warnings in unit tests
signed/unsigned comparisons.

Change-Id: I04c7fc82e23736ab07432a09f4063872e4405735
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-04 10:07:39 +00:00
hjk
a16dbc2582 Ios: Use plain C++ for IosRunConfigurationWidget
In preparation for the use of ArgumentsAspect. There's not much
in the form anyways.

Change-Id: I5a4c5d508a032a12bcabc2d1d7f35f3d390e43b5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-12-23 10:41:26 +00:00
Alessandro Portale
850141cea0 Utils::Icon: Make the style options flag based
A drop shadow and the "punching of edges" are now independantly
settable.

Change-Id: I48bf88944d0cfce504aef0a1c04979ab2dc4cb9f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-12-23 09:03:53 +00:00
Alessandro Portale
22e8e8886c qtcreatoricons.svg: Removing error/warning/info_big
They have never been used

Change-Id: I38682f5707bd5626a83d9c7e5a59f0fc98ddf037
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-12-22 16:16:59 +00:00
Andre Hartmann
9bf7f83845 DiffEditor: Sort includes
Change-Id: If646e27683e351e4308906f58b325dc47ff83c8b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-12-22 11:54:30 +00:00
Andre Hartmann
067682a25e GdbEngine: Fix typo
Change-Id: I333cee6370202ed5e9623025d484a2f5637a05c5
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-22 09:38:57 +00:00
Eike Ziller
e29dc8b6e8 EditorManager/Locator: support (<linenumber>) after file names
The style that is used by MSVC.

Task-number: QTCREATORBUG-14724
Change-Id: I2ffffb507a1e404fa30e9c8ea15aa6b11dfc5b32
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-22 08:31:55 +00:00
Eike Ziller
4502e70e2f Use regular expression for EditorManager::splitLineAndColumnNumber
Makes it actually easier to understand.

Change-Id: I33c442f501ecdf66077f8785bf8418a6d699f2ee
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-22 08:31:44 +00:00
Eike Ziller
28060b1cb0 Add tests for EditorManager::splitLineAndColumnNumber
Change-Id: I02a47360df7f6fc86ac2bd79869896b331e7b6bb
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-22 08:31:36 +00:00
Eike Ziller
bfd66bada9 EditorManager: Unifiy "split line number" implementations
We should have a single method that covers all use cases. Also get rid
of output parameters from the function.

Change-Id: I801fbd0d38499f0997d21df99ca75ba40f9f73b6
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-22 08:31:26 +00:00
hjk
e0fdeaa624 QmakeProjectManager: Use WorkingDirectoryAspect
Change-Id: Ia0359477bad1d40a2349e782b19600fa19547216
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-22 07:21:22 +00:00
David Schulz
05789c8da1 CdbExt: Fix indices when the predicted number of children...
...differs from the real child count.

Task-number: QTCREATORBUG-15016
Change-Id: Iaadbd6a0de6e1e068b072705e1d1a264ca03a855
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-12-21 14:59:38 +00:00
hjk
64a8732060 QtSupport: Remove unused CustomExecutableRunConfiguration member
Change-Id: I9f5e7af3767d1a92c0e2104ca56bdb9d0b99f33b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-21 11:08:48 +00:00
hjk
1cdbe5cde9 Debugger: Remove unused functions in cdb extension
Change-Id: I96991f8dad6f384d798bd27738176fe7319de797
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-21 08:36:14 +00:00
Tobias Hunger
293cc57064 Modeleditor: Use a JSON-based wizard
Use a JSON wizard in favor of implementing the same thing in
code.

Change-Id: I5952bf417255fb75378e42e3e80b13c0a0d3d317
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-21 08:29:47 +00:00
hjk
c2bf384ac2 Debugger: Split DebuggerEncoding enum
... into a string specifying a kind of encoding (utf8, latin1),
an optional bytesize (2-byte integers, 4-byte integers) and a
flag whether the displayed value should get "..." around it.

Scales better than adding an enum value for each new combination.

Change-Id: Iffcb1e2f148f12da96e165559a976bd34026c649
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-21 07:32:14 +00:00
Andre Hartmann
74b33929d8 CustomParser: Use QRegularExpression instead of QRegExp
Change-Id: I952f61a30435b26bf5c77f0b219ddc3b17b0c2e4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-18 19:13:40 +00:00
hjk
9d18de6110 ProjectExplorer: Avoid updates from the environment
... to the working directory widget if that's not present anymore.

Change-Id: I242d128b0241735dc6cac84290c9cee66a989067
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-18 13:48:42 +00:00
Robert Loehning
1ec2796c9b Debugger: Update tooltip referring to renamed view
Change-Id: I46e8194f20e496f530d19ff06e189754cb225e3d
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-12-18 13:35:50 +00:00
Orgad Shaneh
3f46e3da30 TextEditor: Make TextEditorSettings all static
Move the fading indicator to the widget

Change-Id: I762c46845153c93c75ea0198c993b655559fad3b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-18 12:01:59 +00:00
Orgad Shaneh
0f8a3abb8b TextEditor: Rename slotCodeStyleRemoved and make it private
Change-Id: I70f3ef86faa3c7c4e55bdd524c6a17cdb13c8fc1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-18 11:54:16 +00:00
Orgad Shaneh
9d3b2f0998 TextEditor: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I380120e3419d2a3c0e272f51cc3e0d5f6aaa5e9b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-18 11:54:12 +00:00
Orgad Shaneh
b6131e1b1d TextEditor: Fix wrong disconnect signal/slot signature
Change-Id: I583068a0db954fe01edeaf557a22515a6d5c7e94
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-18 11:49:49 +00:00
hjk
be4aba7dc2 QmakeProjectManager: Use TerminalAspect
As side-effect, this fixes the automatic update of the terminal options
if the .pro file changes and no manual changes have been made yet.

Change-Id: I5b102b2587a8f2f1b326ecc9f4cec98edad74a16
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-18 08:46:34 +00:00
Jochen Becher
ef9ddf408e ModelEditor: Fix class member parser
Fix parsing of C-style comments, multi-line declarations
and some Qt keywords.

Change-Id: Ifc6121dca47b245385a01eef568b3775e846c566
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-17 20:42:00 +00:00
Jochen Becher
e7ed85aaca ModelEditor: Copy selected elements to clipboard
On Copy (Ctrl+C) the selected elements on a diagram are
copied as an image into the clipboard. If no element is
selected all elements are copied (as it was before).

Change-Id: Ia24e1cae44ea3cc7303198fe7bfd3174c7a970cc
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-17 20:41:49 +00:00
hjk
6a71c63186 Debugger: Make display of QObject names optional
... and switch it off by default. The feature has indeterministic
performance impact and lost quite a bit of its utility since GDB
learned to extract dynamic object types most of the times.

Change-Id: I22cccb03ba67f9ff6ad757bbc06eb372d84bbffe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-17 14:58:23 +00:00
hjk
e5b9e819fa CMakeProjectManager: Use WorkingDirectoryAspect
This mimics the relevant parts of QbsProjectManager.

Change-Id: I31257556ce0fcc714f6fac26f9d0b88ca6cb076b
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-12-17 11:16:07 +00:00
hjk
beb561b8cc Debugger: Remove unusued WatchData::displayType member
Change-Id: I475c5f6ee90434a6e85342d8bb71bd10a04dd27b
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-17 09:14:29 +00:00
Nikolai Kosjar
86f3194cc1 Clang: Add disabled test ArgumentToUserDefinedIndexOperator
It looks like there is no way to mark a test as expected to fail, so
disable it.

Task-number: QTCREATORBUG-15473
Change-Id: Ic6cb2c00a64cf647cb499492064d451d0dd08075
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-16 15:21:21 +00:00
hjk
20d22e52df BareMetal: Don't assert in displayNameForId() for unknown ids
This function can be called with arbitrary ids. Follow the pattern
in other device implementations and don't choke.

Change-Id: Ica25f2d24fe673ad025883bf106fc270f27fa4fe
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
2015-12-16 15:02:35 +00:00
Lukas Holecek
ecf3eb1d9e FakeVim: Handle Ctrl+[ with Russian keyboard layout
Task-number: QTCREATORBUG-15261
Change-Id: I6b63fdce965347dc883c72223b482883beccbb80
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-16 14:54:43 +00:00
Lukas Holecek
a5b85651dd FakeVim: Add checks before handling keyboard input
Some inputs can be unrecognized with some keyboard layouts
(QKeyEvent::key() will return 0).

Change-Id: If7b49330ac00a2493a956331c7bbe8ea2a4305ae
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-12-16 14:54:30 +00:00
hjk
e31de93ba6 QMakeProjectManager: Use ArgumentsAspect
Change-Id: Ia7443193213c0e83551c0a790d5662375265bbef
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-16 14:50:23 +00:00
Nikolai Kosjar
9abfd73204 CppTools/Clang: Remove InMemoryInfo
...nowadays we only need the working copy.

Change-Id: I30924b3c5dc68b428d6c10f6ba015b0640b476d2
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-16 13:29:21 +00:00
Nikolai Kosjar
802f9f47e9 Clang: Pass IpcCommunicator directly to ClangEditorDocumentProcessor
Change-Id: I666c56f304522a3edc2a21055df4ef70aecb0e0e
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-16 13:29:17 +00:00
Nikolai Kosjar
cbdcd1e4a7 CppTools: Move function to BuiltinEditorDocumentProcessor
It's only needed there.

Change-Id: Id12aa9d0fdf50b3292316426587677f79a09a9e9
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-16 13:29:12 +00:00
Nikolai Kosjar
beb977dc8a Clang: Add DISTFILES to easily access the doc
Change-Id: I0a7035dbef4b3863521aebe5f08a7526d3e09de7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-16 13:21:55 +00:00
Nikolai Kosjar
ca63359386 CppTools/Clang: Clean-up of includes
Change-Id: I0ba340dcf0ee23e61588f17262d07e7088751836
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-16 13:15:38 +00:00
Nikolai Kosjar
f89d3dca8b Clang: Activate code model automatically if plugin is loaded
This removes also the need to close editor documents.

Change-Id: I96c68105bceb37841053f3dbd8a264e059a02cb8
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-12-16 12:23:58 +00:00
hjk
6dcdba92f3 Debugger: Show a warning if Python < 2.7 is used
Execution will continue for now, but not for long.

Change-Id: I1abc57e6375e5ec4d24c7299f68f59c5bb06f3c9
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-12-16 12:02:26 +00:00