Commit Graph

44854 Commits

Author SHA1 Message Date
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
Tobias Hunger
c6a377f834 Sprinkle override over ProjectConfigurations
Change-Id: I4470b28184ce67e11ac5921b481db63cc26144c4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-13 14:45:20 +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
Christian Stenger
28fc8c02b3 Add plugin unit test for data tags
Change-Id: I765989cd18c3aff0b8bbc81e4e303e9354e327b7
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
at-v3.6.0-rc1
2015-11-13 11:32:23 +00:00
Christian Stenger
1b97b5e4d3 Fix data tag support for split header and source
If data functions where defined inside the source file when having
source and header split they were simply ignored.

Change-Id: I6d32d3c721f656797a78d3ea740c102d6b93ec88
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-13 11:32:16 +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
Eike Ziller
0603e3fd93 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ide51ab3b3ad9430ae52802f3184266ccf1284909
2015-11-12 13:39:58 +01:00
Eike Ziller
dffd49ef07 Merge remote-tracking branch 'origin/3.6'
Change-Id: I8e1d8505ae84773e58287dbc13a36d83835cb658
2015-11-12 13:39:26 +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
Ulf Hermann
b0cde98529 Timeline: eliminate TimelineContent.gotoSourceLocation
When recentering we don't need to do it and when propagating selections
we can just immediately set the values.

Change-Id: I429ab70fcb1c83416ceeec2b23a350505488d05b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-12 09:15:11 +00:00
Eike Ziller
09417c56bd OS X: Use autoreleasepool blocks in Objective-C(++) code
And get rid of the helper class from utils.
All supported platforms support this.

Change-Id: Ic4307a42fc55ac4673438ea4325bca14ed33849b
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-11-12 09:09:31 +00:00
Nikolai Kosjar
d8f119c8a2 Clang: Allow to provide extra command line options
This can be used to experiment with clang options that e.g. affect
diagnostics.

Changes take effect on editor re-open.

Change-Id: Ie46d0ff085a3700a748dbcf4b94b93b0bf9c4642
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-11 15:14:56 +00:00
Nikolai Kosjar
72785e3a11 Clang: Activate the code model with a check box
If the plugin is not activated, show a hint.

The underlying settings are still mime type based. This will be
addressed in a follow-up change.

Change-Id: I24b232365d505a0022a78e96eb496d219a8b7c5b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-11 15:12:19 +00:00
Orgad Shaneh
942aa12f77 JSON: Fix MSVC2013 warnings
json.cpp(221) : warning C4800: 'uint64_t' : forcing value to bool 'true' or 'false' (performance warning)
json.cpp(322) : warning C4800: 'uint32_t' : forcing value to bool 'true' or 'false' (performance warning)
json.cpp(756) : warning C4244: '=' : conversion from 'int64_t' to 'double', possible loss of data
json.cpp(953) : warning C4244: 'return' : conversion from 'const double' to 'int', possible loss of data
json.cpp(4408) : warning C4244: 'argument' : conversion from '__int64' to 'int', possible loss of data

Change-Id: I2a24f90f7615aeb47f747ecbe3b580f23773ebda
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-11 14:04:02 +00:00
hjk
0f9e2baa1b Debugger: Adjust QFileInfo dumper for Qt 5.7 on Linux 32 bit
Change-Id: Idb14d81aa3546af0e7a21922fbb6d551ecbc1b06
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-11 13:57:37 +00:00
Orgad Shaneh
1fd8760789 Git: Do not use file name when retrieving parent commit
Right-clicking a commit on blame shows the parent commit relevant for this file.

In case the file was renamed, fetching the parent can fail (since the file with
this name did not exist before the requested commit).

Using the direct parent is good enough, and should work for all cases.

What the user is really interested in is "how did the file look before this
commit", and the exact "previous" commit is not really interesting.

Change-Id: I7d74efce5f2b065f62e978ba5f14d3010a5f2c7f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-11 13:24:06 +00:00
Orgad Shaneh
bd858d9753 Git: Mute commit description fetching on right-click
Change-Id: I7f7b1b1cdc4e557748b4c9781c96be65f57156e3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-11 13:22:56 +00:00
hjk
aa221121b6 Debugger: Pass down expanded inames in LLDB tests
... as well as the 'autoderef' flag. A lot of dumper tests were
failing even though the dumpers themselves were ok.

Change-Id: I198784d95eb0004e81bfab995121e048b1722c66
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-11 13:16:17 +00:00
hjk
aed9c46ea6 Debugger: Try to handle empty base classes more gracefully with LLDB
Empty base classes are counted towards GetNumberOfDirectBaseClasses()
but do not get reported in GetChildCount(). Fix the difference by
manually creating empty base class entries in the report.

Change-Id: I2650d9f5234302c5bf2fa0e62a886d3a39fc11db
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-11-11 13:11:32 +00:00
Nikolai Kosjar
17822dad60 Adapt to upstream CompilerOptionsBuilder changes.
Change-Id: I4d6340113f044357467ecb3a157e78ad51ef5497
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
csa-v3.6.0 csa-v3.6.0-rc1
2015-11-11 10:49:36 +00:00
Tobias Hunger
1fc570acb7 Kits: Do not lose toolchains when using SDK-provided kits
The observed behavior is:

The first time you open Qt Creator from the Qt 5.6 package you get
the kit for the installed Qt version with a toolchain. The next time
you start the toolchain vanishes from the Kit.

Surprisingly nobody reported a bug about this:-/

Change-Id: I49545e11f02eadb73f583b134d9eadfc2adf3bec
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-11-11 10:31:58 +00:00
Nikolai Kosjar
4d1a1981a8 CppTools: CompilerOptionsBuilder takes project part by reference
...since it assumes a project part != 0 and does not participate in
ownership.

Change-Id: Ia9c1eca52776990576a2dac61e9144234b04c59c
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-11-11 09:51:19 +00:00
Christian Stenger
340572c980 Scripts: Fix deployqt
When comparing re.MatchObjects instead of real bools the objects
normally aren't identical.
This lead to filtering out all libraries and not copying anything
to the respective directory.

Change-Id: Ib17cc04d281620b142ac570475d8fdc4912eaa86
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-11 09:22:25 +00:00
Jochen Becher
11eca8374b ModelEditor: Apply naming convention to enums
Change-Id: I215214965d4f6196d805b9001cf59d8cbf2c7c64
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-11 09:08:10 +00:00
Jochen Becher
5d3812af28 ModelEditor: Apply naming convention to getters
Change-Id: If9eaaf0dc54e26e4b7e2b8952efd951a9113f104
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-11 09:07:53 +00:00
Christian Kandeler
21ad1804f6 QbsProjectManager: Fix soft assert.
Change-Id: Ic970642aa37d0983b41b7be6459140bcc2f6ed42
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2015-11-11 08:52:12 +00:00
Christian Stenger
66c2ba6076 Json: Fix compile for MSVC2013
Change-Id: I5266165c64bb4c1bdb75ac04f9a5fadb6d97e6ee
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-11-11 07:45:39 +00:00
David Schulz
90ed0cf793 Debugger: Remove unused setting ListSourceFiles.
Change-Id: I4c60dcbf29ac050cdead98f2c58c204e3ffbab0a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-11-11 07:35:33 +00:00
Niels Weber
58804ad823 Fix two typos in comments
Change-Id: Iacb728715b11ca3a9f82d82cca49889eea9dd59b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-11 06:56:08 +00:00
Alessandro Portale
beac7dcb99 HighDPI fixes
ColorTip:
Draw the border around the color tooltip properly.

MiniProjectTargetSelector:
Fixing a few misplaced outlines

FancyActionBar:
Fixing a few misplaced outlines, also:
- deduplicate hover gradient painting code
- use pixmapcache for the hover gradient
- only draw the hover gradient if the tab is hovered
- use 0-255 as range for fading value

QtQuick Designer:
HighDPI form editor icons, and removing some since a
while unused icons.

ProjectExplorer Mode:
HighDPI graphics and fixing a few misplaced outlines

Task-number: QTCREATORBUG-15222
Change-Id: I4fcf515014317791499ad89bf6ef88d961e4b752
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-11-10 19:52:17 +00:00