Commit Graph

43121 Commits

Author SHA1 Message Date
Tobias Hunger
c62ad6c450 CustomWizard: Make sure to create wizards with unique ids only
* Warn when somebody tries to register the same id twice
* Make sure the user wizards override the global once so that
  this warning actually makes sense

Change-Id: I69624666960c8836e25fd34abeef67015c1363ad
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-18 13:31:45 +00:00
Tobias Hunger
e39b515cd2 GenericProject: Fix display of files in project directory
Having a folder "." in the project tree is ugly, so fix that.

Task-number: QTCREATORBUG-15344
Change-Id: I0817f609162dbc39f7bb4f98e6afe85169710fb7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-11-18 13:31:39 +00:00
Christian Kandeler
e072133aa4 Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: Ida2b0359866ce4397a8a10338103d592b0037d4f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-18 12:37:31 +00:00
Orgad Shaneh
c37193f884 BareMetal: Fix cloning of GDB server providers
Change-Id: Ie063ce3ab2caf5cf2ee709236db891e22bb9cc8b
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-18 12:22:51 +00:00
Ulf Hermann
131c8027da QmlProfiler: Fix traceTime updates
If the trace time hasn't been set yet, decreaseStartTime and
increaseEndTime should still do something.

Change-Id: I626c0df66a5d7327708ada77c78546ad4aafc52b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 16:44:01 +00:00
Ulf Hermann
9f857880a7 QmlProfiler: Initialize the model progress numbers
Change-Id: I037d0146e20d5fe1681f455fbd5da9ac5e89184b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 16:03:31 +00:00
Marco Bubke
bcd93b594e Clang: Extract highlighting information
Prepare the move of the semantic highlighting to the clang back end. We
have it under tests too so it should be quite easy to make changes or
corrections.

Change-Id: I5706a8a06fde5a9ba2eba3a8ba62782102ac0bd3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-17 12:41:37 +00:00
Marco Bubke
611d7db4de Clang: Don't instantiate value two times
Change-Id: I5619f157a8a251ad06f6ea63d310015d13eb4c9c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-17 12:41:04 +00:00
BogDan Vatra
9db8adec7d Export explicitly instantiate templates.
LLVM & MSVC needs to explicitly export the instantiate templates.

Change-Id: I51562750415400bfa561fd6e759211f2b4b10650
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-11-17 11:35:44 +00:00
Ulf Hermann
7d87b9cd97 Timeline: Pass the right dragOffset to CategoryLabels
Also, make sure the category dragger only reacts to vertical mouse
movements.

Change-Id: Ic53db9030536a1f2d35ea02facb920a4d3f0a005
Task-number: QTCREATORBUG-15333
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-11-17 10:07:00 +00:00
Marco Bubke
7fb4315da2 Clang: Adapt to new Google Test project directories
Google mock moved to github and merged with Google Test.

Change-Id: I66639532be1cd399c47dfd4511430b2d65b76b23
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-11-16 14:39:12 +00:00
Nikolai Kosjar
f7741ef63c Clang: Report only diagnostics that can be shown in the editor
Change-Id: I9c258159d240c6ba7eeff34702d8512d9220b3af
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-16 14:18:37 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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