Commit Graph

43591 Commits

Author SHA1 Message Date
Nikolai Kosjar
439db76f64 CppTools: Clean up CppCodeModelSettingsWidget
Change-Id: Iee93d2d656a8a5c991b292d3e591cedd3e86f9e3
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-16 14:18:30 +00:00
Nikolai Kosjar
48952084a6 Clang: Remove per-mimetype settings
Related to

    commit c47079f97f7d42db0c581525a2ce6fddbc0995f2
    Clang: Activate the code model with a check box

Change-Id: Ief11768ba0dd27788032e2dd3ad9b7ae39a8f52b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-16 14:08:25 +00:00
Tim Jenssen
db16798e0d JsonWizard: Enable directories as file source in file generator
Change-Id: I303f31311a619a86c5669ec7b15c341ab77a2c48
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-16 14:05:37 +00:00
Tobias Hunger
79f82d0d0a BuildManager: Provide context of earlier build steps to init
This information can be used to get information from earlier steps,
which e.g. queried for android devices to deploy to.

Change-Id: Iefe1c9443915cb6211f86f98ff7aaf3cb75145ba
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 14:04:59 +00:00
Tobias Hunger
cedf015c10 ProjectConfiguration: Clean up some constants
Remove unnecessary constant and move others into the cpp file where
they are used.

Change-Id: Ib1e8ac69a39eb38794bbdafc860ca42ca29c3bdb
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 14:04:40 +00:00
Leena Miettinen
140b39487b Doc: fix label text in docs
Libraries -> Library

Change-Id: I39117f76c332b2a08196e2e40551a64ba1d1b135
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-16 13:53:54 +00:00
Eike Ziller
2bcd2d4d04 EditorManager: Remove wrong warning
The mime type hierarchy is not a tree (e.g. diamond shape inheritence is
ok), so if we traverse a parent hierarchy and encounter a mime type
twice, that is not an indicator for an actual loop / wrong hierarchy.

Change-Id: Ic116deac5a03b9692e2267252598db6d8721f39e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-16 12:31:14 +00:00
Tobias Hunger
6d797a9097 Modeling: Fix warnings about hiding symbols
Change-Id: I434a80facf2d7550865277b32ce207908a50c48b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-16 11:17:34 +00:00
Tobias Hunger
468cbbaadd Fix warning about unused private member
Change-Id: Ib2f26efbc7fd2d3de13687b827c77f8022e850ec
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 11:16:45 +00:00
Tobias Hunger
a110abeed7 Remove unnecessary destructors
Change-Id: Id0bc2d3a305e6af24838266195ab22e04e3a12a1
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 11:16:17 +00:00
Topi Reinio
be1e793cdc Doc: Fix misaligned table headers
The first header spans two cells vertically, not three.

Task-number: QTBUG-49424
Change-Id: Id701fa2eadab0cf0c95297215330bfc29a119ee3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-16 10:38:45 +00:00
Adam Strzelecki
9b3723d6f4 CppTools: Do not highlight instantiation as call
Underlying C++ model sometimes marks C++ object instantiation using initializer
as a (forward) function declaration. This leads to incorrect highlighting of
object variables as if they were function calls.

C++ model however marks in this case (and not any other case) such symbols as
ambiguous function types, see CPlusPlus::Bind::visit. This change skips such
ambiguous functions for highlighting as function call.

Also add test case for related bug report.

Task-number: QTCREATORBUG-15212
Change-Id: Ifde8db407f2fa8275a3f991bfa3d3b73eca8c14e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-16 10:18:05 +00:00
Tobias Hunger
0e278e9efe ProjectConfiguration: Sprinkle override and explicit over the code
Change-Id: I2aa3a32a0d30f1d122977d94d4109227dea6bbd7
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-16 10:14:32 +00:00
Martin Kampas
87f6b92e34 Core: NewDialog: remember category & platform choice persistently
Change-Id: I80256a787c3a17ff9faaa46bbcef51035a7530a4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-16 10:13:55 +00:00
Leena Miettinen
d5decff558 Doc: rearrange the table on the front page
...into two rows instead of three.

This looks more symmetrical and seems to fit on the
screen also when using a low resolution.

Change-Id: Id2f9a7182a6a260036f3d8913058fd2aa7c24c57
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-16 09:34:48 +00:00
Tobias Hunger
ca29cbfc8a Consistently use Utils::FileNameList
Consistently use Utils::FileNameList in favor of QList<Utils::FileName>

Change-Id: Iafbb466c882bfd91c25c9e78f107d401bfdb6d55
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-16 08:33:02 +00:00
Orgad Shaneh
f910742979 Gerrit: Initialize all members
dependeOnNumber and neededByNumber were not initialized.

Change-Id: I12b90b842d540ae0e8ac9ff5be1be2ace2473ba8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-11-16 08:27:41 +00:00
David Schulz
69a4f80c69 WinRT: Fix C++ debugging when qml debugging is also enabled.
This is also a preparation to enable QML debugging. Unfortunately
the WinRT QML library isn't printing the needed "Waiting for connection"
output so far.

Change-Id: I5e106de0272a0876749aaf77f1ebf74b952d3471
Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
2015-11-16 08:15:46 +00:00
David Schulz
153d593b63 Modellinglib: Fix linking for msvc.
The Utils dependecy wasn't explicitly added to the project
dependencies.

Change-Id: I8f294cb2b220105c0cd83a3205594d00a051679e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-16 06:51:20 +00:00
Christian Stenger
9d465e4e04 TextEditor: Fix compile with Qt5.4
Change-Id: I35fabccf526446095b067ca6863b57474cef6ba5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-16 06:19:08 +00:00
Jochen Becher
be5d3c0a8e ModelEditor: Avoid identifiers reserved for compiler
Change-Id: I5519197e7308ddcfb0ac507ef9272de8d8eb9f19
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:40:02 +00:00
Jochen Becher
db95a3ec3a ModelEditor: Fix use of conditional code and preprocessor macros
Remove some dead code, debugging code and use of QMT_CHECK.

Change-Id: I04939484fbfa02ca6a816777c355f7db7d7f8077
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:55 +00:00
Jochen Becher
a441513596 ModelEditor: Fix use of Q_UNUSED
Change-Id: I379c9f0cd3ccc9fe4ef51c29ddd9de2b87b3e6c1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:49 +00:00
Jochen Becher
adb24b74bb ModelEditor: rename a lot of boolean attributes to m_is...
Change-Id: I4e4711d480de37b85870e18b89b035ba05be3ddd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:44 +00:00
Jochen Becher
356de5e26d ModelEditor: rename attribute m_busy to m_busyState
Change-Id: I5899f8aab2d6b5bc564bb9d18af04fbc863503d9
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:38 +00:00
Jochen Becher
f59555e190 ModelEditor: Rename nameSpace to umlNamespace
Change-Id: I177f6db40355277ce1227e033d6f259bc1574c91
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:32 +00:00
Jochen Becher
aa6d69b7bc ModelEditor: Fix calls from derived classes
Change-Id: I4f144bd925bd5f72272e50628d46996b0dba5369
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 18:39:23 +00:00
Eike Ziller
a17d40559d Fix crashes with FunctionHintProposalWidget
The FunctionHintProposalWidget actually is not visible, but the
FakeToolTip popup is. That is also checked for visibility to decide
if we currently have a proposal open. Now, clicking anywhere
while the popup is open, closes the popup (as it is a tool tip).
The FunctionHintProposalWidget is never closed though, which is bad since
e.g. CodeAssistant expects the FunctionhintProposalWidget to die.

The patch just aborts the FunctionHintProposalWidget when the popup dies.

Task-number: QTCREATORBUG-15275
Change-Id: I890f8f2a61859f86b2c4b6e3700f1df504f37595
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-13 14:32:02 +00:00
Tobias Hunger
38df7a21aa SelectableFilesModel: Use a destructor in favor of a deleteTree method
Change-Id: Ice1eac65c78dbc94024fef039e072e00eda99a3d
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-13 10:56:02 +00:00
Tobias Hunger
e484160081 SelectableFilesModel: Use Utils::FileName
* Fix fallout caused by that

Change-Id: If1f068b060b414402918118a826a0f9405c976cd
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-13 10:55:44 +00:00
Tobias Hunger
26c872f3e6 TaskWindow: Use Qt5 style connects
Change-Id: I675e1d83b789371925d9c71d4e5f0c2327085d7c
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-13 10:12:19 +00:00
Leena Miettinen
3e7089865d Doc: update screenshot of Projects > Dependencies
The check box name was changed.

Change-Id: I4893a9dbd30025981ba8bbc545327482f8d402e7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 09:46:56 +00:00
Tobias Hunger
727523ffc9 SessionManager: Improve handling of unconfigured projects in sessions
Force Project Mode if the startup project is in need to be configured after
a session is loaded.

Task-number: QTCREATORBUG-15228
Change-Id: I625a9485c5233ff717be20fd2c14c85a3b9275e3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-13 09:16:29 +00:00
Jochen Becher
568223316b ModelEditor: Convert some C-style casts to C++ casts
Change-Id: Idb55d92c33f7758ad3831ac6e42fa6e9edb11d43
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-12 17:12:36 +00:00
Jochen Becher
6add33131e ModelEditor: Apply naming convention to types
Use Pascal style for typedefs and class instead of struct.

Change-Id: Ib568994e70c8ac0a219b2fba1d998e04ef5f79da
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-12 17:12:29 +00:00
Leena Miettinen
073542bb24 Doc: fix names of refactoring actions in the manual
Change-Id: Ica093e5afe5c647e2fe3c7aa385d256257d84ea7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-11-12 15:07:13 +00:00
Leena Miettinen
8bc98b858b Doc: options for filtering JS and QML events were removed
Change-Id: I5917d7fcb8115f9e12212dcb15882271ceb092e3
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-11-12 13:51:10 +00:00
Leena Miettinen
52c00b99b3 Doc: Specifying QML Profiler settings
Change-Id: Ie9667a66a2373d75d5b6c95ec4ad194761008dd6
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-11-12 13:16:08 +00:00
Eike Ziller
d13b22e6bc Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: Ibdf433b54e36e58182b7094f78d47ed3e8c81684
2015-11-12 13:43:17 +01:00
Orgad Shaneh
0bcddcd014 C++: Limit template instantiation depth
A recursive template generates infinite expansions.

Consider the following example:

template <class R1>
struct Base
{
};

template<typename R>
struct Derived :
  Base<
    typename Derived<typename Base<R>::type>::type,
    typename Derived<typename Base<R>::type>::type
  >::type
{};

R is instantiated as Base<R>::type, which causes another
instantiation of R into Base<Base<R>> etc...

This is not a solution, but a workaround.

Task-number: QTCREATORBUG-15141
Change-Id: Ib04f70275e07919e2cb6c7fb61a2045bd52f4a7d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-12 09:40:20 +00:00
Tobias Hunger
a27cd12538 ProjectExplorer: Do not kill applications when deploying
Only kill applications when adding build-steps, not for deploy-steps.
This is more in line with what the documentation says.

Task-number: QTCREATORBUG-15281
Change-Id: Iaa8cfb3efb79645ff29d0c67b24636aefa1d7d3e
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-12 09:39:31 +00:00
Christian Kandeler
2afae6f2c6 ModelingLib: Fix call to pure virtual function.
Change-Id: I57b77a38d978ee8fb6eaf5408bec6f7901740ee9
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-11-12 09:30:35 +00:00
Ulf Hermann
00f84cc698 Timeline: Properly account for out-of-bounds events
If an event has to be clipped its length gets shorter ...

Change-Id: Ic59abebff3e856214bbb12eca324816b4e9e740d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-12 09:19:33 +00:00
Ulf Hermann
58ffe05a2a QmlProfiler: Improve progress metrics for range models
Change-Id: I32b6c77c020c1a3141878282314d7acd87c90af4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-12 09:16:26 +00:00
Ulf Hermann
913c5d8524 Timeline: Don't state that detail windows have contents when they don't
Change-Id: I2d7a8e7f22e785c7cf2dbe21874c7036d52df472
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-12 09:16:18 +00:00
Orgad Shaneh
ba02ec3b03 CppTools: Initialize a local variable
Change-Id: I5cded88ce7c26a80246df79ad4ec43d82619b6eb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-12 09:16:08 +00:00
Orgad Shaneh
3ab5527a83 C++: Produce copyable debug output in CheckSymbols test
Change-Id: I338352eaf6372316d2dc8f0f3ad961b7e8d8cbdc
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-12 09:15:49 +00:00
Ulf Hermann
35ce8f50df QmlProfiler: remove dead code
We never propagate a selection by source location.

Change-Id: I4594b88080bd1834572c0087db0397bc08a81d70
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-12 09:15:23 +00:00
Ulf Hermann
07241006ee QmlProfiler: Adapt to updateCursorPosition() change in Timeline
As the timeline doesn't automatically move us to the right file/line
anymore when we programatically trigger a selection, we have to do it
explicitly now when searching for notes.

Change-Id: I439b2162555a6cbf1c757c691ad3b0de067e3f94
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-12 09:15:20 +00:00
Ulf Hermann
7449c41502 Timeline: Only emit updateCursorPosition on internal updates
If the update was triggered from outside (ie other views synchronizing
to the timeline) then we expect that the source location has already
been taken care of.

Change-Id: I03f4dcc496cde2561a79d86367a61e71ea889561
Task-number: QTCREATORBUG-13360
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-12 09:15:15 +00:00