Commit Graph

45338 Commits

Author SHA1 Message Date
Eike Ziller
29436c3959 runAsync: Set thread priority also when not running in thread pool
Change-Id: I527610cd1d5ed2daf66aa01073e1a001ec56641e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-12 13:29:01 +00:00
Christian Kandeler
b7ee61d389 Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: Ia56b692563848cf27db89b30bfd3439840a4dc41
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-02-12 13:15:53 +00:00
Tobias Hunger
335b9644b6 CMake: Remove debug output
Change-Id: I69e1fd6462f5b03bad8721b236529a12b48a2fc8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-12 13:13:24 +00:00
Eike Ziller
b4e72c2e2b ProjectExplorer: Use runAsync
Change-Id: Ie8e188f3d2a328f24d86bde4d4d7ad01c709dc24
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-12 12:38:43 +00:00
Eike Ziller
8b4f14a8ad Android: Use Utils::runAsync
Change-Id: I632d165be4a7e1f35e6e3d7bf401d40817b17223
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-12 12:38:35 +00:00
Tobias Hunger
c7d906214b CMakeParser: Remove sub-parser setup from CMakeParser
This makes the class more applicable for later re-use.

Change-Id: Ic717dd63962b254fce639061f16b1ca8e12d8098
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-12 12:37:18 +00:00
Tobias Hunger
d400959d7e CMakeCbpParser: Small cleanups
* Do follow-up fixes to CMakeTool

Change-Id: Ia3c587acb85d613499e91988200d8bbae32eca3d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-12 12:37:11 +00:00
Orgad Shaneh
e868357107 VCS: Reslot describe functions
They're used by VcsEditorFactory

Change-Id: I9211f406b389649bf8ff9fe7f24522026b1711d4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-12 12:32:06 +00:00
Nikolai Kosjar
b064b06759 Clang: Display also child diagnostics in tooltips
...by introducing a custom tooltip widget for diagnostics.

Locations and fixits of child diagnostics are presented as clickable
links, leading to that position in the editor or to the execution of
that fix it.

Change-Id: I83e801e22d0421dd29275e333e5dd91587885cf1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-02-12 11:54:09 +00:00
Tobias Hunger
47a5c7f466 CMakeKitConfigWidget: Clean up code
* Use namespace ProjectExplorer
* Move around some headers

Change-Id: I31bea44a25325b5dbc436c55c3db012e22503391
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-12 11:42:40 +00:00
Tobias Hunger
2bcfce96ba CMakeKitInformation: Clean up headers
Change-Id: I903c6529d0df83aaef9f109cdc2650cb76392bd5
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-12 11:42:36 +00:00
Nikolai Kosjar
9a4284d666 Clang: Use CppHoverHandler for diagnostic tooltips
We used to call QTextCharFormat::setToolTip from the ExtraSelection to
install the diagnostic tooltip. Since this allows to set only text
tooltips and we would like to introduce a custom tooltip widget for
diagnostics, make use of CppHoverHandler, which is more flexible.

Change-Id: Ia1b2c3c50810596ce4a3a025002e6e4efd8789db
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-02-12 11:20:27 +00:00
Tobias Hunger
593ed52c94 CMakeProjectPlugin: Clean up some headers
Change-Id: I8ded721395b72bb1c1e6a563f7ebb98389d39236
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-12 11:12:37 +00:00
Tobias Hunger
a764bb49d8 CMake: Add CMakeGeneratorKitInformation
Change-Id: I877c248c7b93268281fc68e814e479d24b844d5f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-12 11:02:16 +00:00
Tobias Hunger
c3aac7624c CMake: Parse cmake syntax errors
Improve the CMakeParser so that it picks up the most common
errors/warnings that cmake throws when running into errors while
parsing its CMakeLists.txt files.

Change-Id: Ie3774695418f13aa3869d78802c1a552e6fd384e
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-12 10:56:54 +00:00
Tobias Hunger
36118a5cb0 ClangBackend: Fix warning about unused member variable
Change-Id: I0608eb32f77bb677f1fecc1c75082ecf29ff1aa8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-12 10:40:57 +00:00
Tobias Hunger
b2d537c878 CMake: Cleanup files
Change-Id: I22a20e598389bf27417bcb230dd469f8f9dfce0e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-12 10:37:13 +00:00
Eike Ziller
61bcbd872e ClearCase: Use Utils::runAsync
Change-Id: Ib2752b2874258a9736b329b2d0ca66ca15998f23
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-12 09:51:20 +00:00
Nikolai Kosjar
e1b14565fa CppTools: Do not clear project state on session unload
Affected functionality was, among others:
 * Getting the correct project part when opening a file
 * Fallback project part (merged defines/includes) not up to date
 * Fallback for "Switch Header/Source" not up to date

In the early days sessions switching was probably implemented by "close
all projects of session X, open all projects of session Y". That's not
the case anymore today.

Change-Id: I4c6a80e2eb219615d3ea6fcf07be7c05072c8832
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-12 07:48:27 +00:00
Orgad Shaneh
ca108a84b9 Git: Show message on fetch success
Change-Id: Ibe9f020d21a0c5eee0ba044b99c62fb181fc173f
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2016-02-11 20:47:24 +00:00
Nikita Baryshnikov
5a408f9db1 ToolchainManager: fix testToolChainManager test
fix "Auto: auto-redetect, duplicate users" case

Change-Id: I7d0ca9a3eff9f217412babf61df8bf7fdb978302
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-11 14:45:45 +00:00
Tobias Hunger
eb651f9fd6 Qmake: moc notes no longer are considered to be errors
Change-Id: Ifccd877d5096279f38a0084a4cb0eba0e7705d87
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-11 14:41:17 +00:00
Tobias Hunger
3990c1c7ed Add "-notest" option that prevents a plugin from being tested
This is similar to "-noload" and prevents a plugin from being loaded
for testing. Nice to blacklist some problematic plugins.

Change-Id: Ib273d244333a9d275969c9608e556a11b7518386
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-11 14:41:02 +00:00
Friedemann Kleint
eb4d1584b6 Add experimental clang-cl based toolchain.
Add new ClangClToolChain, which is autodetect by checking the registry
key created by LLVM and trying to find a suitable version of MSVC2015.

Add ClangClParser for parsing the output.

[ChangeLog][ProjectExplorer] Added experimental support for clang-cl.

Task-number: QTBUG-50804
Task-number: QTCREATORBUG-15641
Change-Id: Id34341570e935afc8ef6a104421d4abb5892176f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-11 09:03:05 +00:00
Eike Ziller
d3c23c3330 GitSubmitEditor: Simplify update of files model
Report the commit data fetch result, including success state and error
message, through the QFuture. That also removes the need for creating a
fetcher QObject and the logic to make sure it is deleted.
Also exchange QtConcurrent::run by Utils::runAsync.

Change-Id: I9c0c03eff2eaa32f577b4599ffda58b0c09de59b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-11 07:16:15 +00:00
Tobias Hunger
acc2194e54 CodePaster: Fix broken connects
I broke some connects today, fix them by turning them into
Qt5 style connects.

Change-Id: I5aab2afcebbef5a5f36840352598c747d5d60477
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-10 16:32:48 +00:00
Tobias Hunger
f62663e8e4 Polish: Remove some more useless "slots" from headers
Change-Id: I9ba3b93e53e63153c1573d51c1aac53b7e088362
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-10 15:02:05 +00:00
Tobias Hunger
b4195d5174 Git: Modernize
* pragma once
* member initialization
* s/struct/class/
* Introduce a static GitPlugin::client() method and use it

Change-Id: Ifdcac86dd16f3cdba11d564d03e9a15f00a6afdb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-10 15:01:57 +00:00
Alessandro Portale
7db0023e8c QmlDesigner: HighDpi fixes for some graphics
- Fresh arrow_down, which is used in many places
- Fresh arrow_up and some tweaks in spinbox
- Fresh graphics for "submenu", "expression and "placeholder"
- Fresh graphics for checkbox indicator
- Removed unused hover checkbox variants
- Added pressed state for checkbox_tr
- Removed radius of focus rectangle in the lineedit

Change-Id: I710ec6ac8ebf86c85a155a812e581cca88845ce3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-02-10 14:07:12 +00:00
Ulf Hermann
6980ccf8e1 QmlProfiler: Fix Qt version comparison for connection type
The previous code would fail on Qt versions n.0 to n.5 with n > 5.

Change-Id: I7e9d512bab269137862370db86e0da19e250059e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-02-10 13:35:02 +00:00
Tobias Hunger
5e81050450 Autotools: Use Qt5 style connects
* Get rid of "slots" from the headers

Change-Id: Ie12f5705a2ca92a431992a45f57193a72ea7032a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-10 13:32:58 +00:00
Tobias Hunger
8b46136b60 Perforce: Modernize
* use pragma once
* remove debug code
* Remove some "slots"
* Use Qt5 style connects (almost everywhere)

Change-Id: Iaa9c3bbacbb2be3c96502c52cc169ad4ec7015a5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-10 13:32:50 +00:00
Orgad Shaneh
84f2875f6d Git: Support tree argument for Grep
Change-Id: Ic7dfcd8bad98223d68725f1a0c1f103ad8ea4e0f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-10 13:10:17 +00:00
Tobias Hunger
fcdb286cec Mercurial: Modernize
* Use pragma once
* Use override
* Use member initialization

Change-Id: Ibd4f3c65929932db0e44be70fd5915b921438564
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-10 13:08:40 +00:00
Tobias Hunger
cf3c347220 CodePaster: Modernize
* Use pragma once
* Make some slots private members

Change-Id: Iebc593f4cd6c690bedfcd1d4dfeb0882bf78ec74
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-02-10 13:08:19 +00:00
Thomas Hartmann
c7a6221e6e QmlDesigner: Evaluate properties for the root item in dummy context
We evaluate properties for the root item in dummy context if
they contain "parent.".

Defining a parent in the dummy context was not working for QML 2,
because there seems to be a shortcut bypassing the metasystem for parent.

Task-number: QTCREATORBUG-15530
Change-Id: I710f1ef36b8c97cc481b9909a775f06d9e03f666
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-10 11:30:05 +00:00
Eike Ziller
72af6b7834 runAsync: Remove ResultType template parameter.
It is now deduced from either the type of the
QFutureInterface<ResultType> function argument, or the return type.

Change-Id: Iddab3cc329206c649a6e55a44b2de2d406701dee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-10 10:58:55 +00:00
Thomas Hartmann
ece316fb64 QmlDesigner: Adding dummydata as context property
The dummyContextObject is now set as the context object

Change-Id: I710f1ef36b8c97cc481b9109a775f06d9e03f6b6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-10 10:36:34 +00:00
BogDan Vatra
bb525e5fc9 Access itemModelNode.
itemNode property was changed to return the itemNode id, which is not enough for
custom QML Designer plugins to access model data.

Change-Id: I8111ba27ff4b32aca5c954b3739d15495a60ec58
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-02-10 09:49:54 +00:00
Christian Kandeler
de2c79044c QbsProjectManager: Only update run configs for active target.
Like qmake does. Otherwise, since the unique product names contain the
associated profile, inactive targets get run configurations for products
with the wrong id. These get removed and re-inserted on the next target
switch. The user-visible effect is a suffix "2" alternately appearing
and disappearing on switching kits.

Task-number: QTCREATORBUG-15372
Change-Id: Ib57859103786988d273733680a373a8283295a35
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-09 13:08:41 +00:00
David Schulz
eb96cb45ff Cdbext: Fix QString dumper.
Change-Id: I437e01c4408c3a5052d0b78c1c75de545f541a7e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-09 13:03:37 +00:00
Orgad Shaneh
b5987a6d49 Git: Require 1.8.0
Remove some workarounds for older versions

Git version in debian stable is 2.1.4, and in Ubuntu 14.04LTS is 1.9.1.

Change-Id: I8d558857a429149222b817401b98e90df10447b6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-09 13:01:47 +00:00
Ulf Hermann
4a5213926b Add support for qscxmlc and state chart files to project managers
Change-Id: Ic0ac337ea90310239a2b1e681083f2201a76afe8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-09 12:53:42 +00:00
Eike Ziller
e1da5418e9 Runextensions: Move mapReduce to its own header
Change-Id: Iad4eff0fa9574561255972b1614ec9e9d9eb88c8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-09 10:59:15 +00:00
Eike Ziller
69a9c4ae12 runAsync: Let all overloads call a single main implementation
And add some documentation.

Change-Id: If307ccfc8be68280694c2bccdbc95f72765524f8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-09 10:59:07 +00:00
David Schulz
83d5435679 Editor: Delete snippet trigger text.
Select the text that was typed to trigger the snippet before
inserting the snippet data.

Change-Id: I15a6e08321d03b56dcfe0e62bb0e317b6f0529e4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-09 10:18:58 +00:00
Ulf Hermann
21d1f6161e QmlProfiler: Avoid race conditions when loading or saving data
We cannot assume that the model manager is still available when the
operation finishes. Also, accessing the QML model or the trace time
from the thread is dangerous.

Change-Id: I673c57c09490a0e3e2647f3197929eff1ce4ceb3
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-09 09:53:45 +00:00
Ulf Hermann
0dff03e6fe TextEditor: Implement BaseHoverHandler::identifyMatch()
The extra selection tooltips are a good default for a hover match. We
use that in the basic plaintext editor to show, for example, syntax
errors in XML documents, detected during extra compiler runs.

Change-Id: Ib7f755c482ebc04148567105e4779324799fb670
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-09 09:36:36 +00:00
Orgad Shaneh
654aa3a0d7 Git: Use a progress timer for Grep
Change-Id: I579bd9bf9e4060f4620afcbd42ac866d0d19bd37
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-09 09:09:14 +00:00
Nikolai Kosjar
c997e5e54c CppEditor: Clean up CppHoverHandler
Change-Id: I1ac54206ca2735c55c1468ddd4ab5f3106665f16
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-02-09 09:07:48 +00:00