Commit Graph

44854 Commits

Author SHA1 Message Date
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
Orgad Shaneh
c554dae687 Core: Make parent argument last in ProgressTimer ctor
Change-Id: Id6513c46c72f0f4729783136ba0e9d779af7d147
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-09 09:06:41 +00:00
Orgad Shaneh
9d7efda496 Core: Export and de-templatize ProgressTimer
* Enable usage with QFutureInterface of non-void types
* Remove watcher. Instead, start the timer immediately
* Replace inheritance with aggregation of QTimer

Change-Id: I4a7d8e2b8c885fd7a84a0134be3e41220952c185
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-09 08:56:50 +00:00
Nikolai Kosjar
9a248913c8 TextEditor: Fine tune painting of the light bulb
* Paint it a bit bigger
* Center vertically in line

Change-Id: I5ba751e9b1e21591965bbf7a9ce020ee7b2b9c66
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-09 08:43:50 +00:00
Nikolai Kosjar
bab230313d TextEditor: Clean up RefactorOverlay::paintMarker
* Rename variables for readability
* Use const

Change-Id: I74d44a5075738b1aef28a97f647431848564544a
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-02-09 08:43:45 +00:00
Nikita Baryshnikov
b34b019c10 ProjectExplorer: Remove metatype registration macro usage
in places where we do not need it. Also removed metatypedeclarations.h

Change-Id: I406891ff9b87e88112ae6317c479f5fab83625c8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-08 15:36:35 +00:00
Eike Ziller
e307b7eecf QmlProfiler: Avoid QtConcurrent
QtConcurrent runs everything on a global thread pool, which means that
calls of QtConcurrent::run/map/etc can block each other.

Change-Id: Ia7a61b5ae1e0919113205a83a43caa1f27015732
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2016-02-08 15:36:11 +00:00
Orgad Shaneh
d4816850f0 Git: Return QByteArray in synchronousShow
Will be used by Grep

Change-Id: I9346707eef2fe55085b0edf090e117fe45afe8bf
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-08 14:49:06 +00:00
Orgad Shaneh
71166d06d0 Git: Minor cleanup
* Remove unused includes
* Remove QObject qualification
* Use a raw pointer for widget instead of QPointer. It is owned by GitGrep.

Change-Id: I4e2c9878289ed3491bfd7b0565a683bc01e485f3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-08 14:49:02 +00:00
Marco Bubke
974070d2c8 Clang: Use MessageEnvelop instead of QVariant
QVariant has unwanted dependencies so we provided our own simpler solution.
We want to support move only types and calling the copy constructor as you
move the value in and outside. This copying is adding unwanted overhead
too.

Change-Id: I2e27a7924868efe81e8b8ff3415499c9fa22c2bc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-02-08 14:11:44 +00:00
Ulf Hermann
c3bbf389d9 QmlProfiler: Make flame graph view compatible with Qt 5.4
Change-Id: I88495cb51f1f28e168290137930aaf949e83b4c5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-08 13:52:35 +00:00
Orgad Shaneh
f611403e83 TextEditor: De-virtual executeSearch
Git Grep is now implemented as an extension, instead of by inheritance.

Change-Id: Idec79ec167a3ca35d87deb2d0e16e134f093b67f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-08 13:26:04 +00:00
Alessandro Portale
9d9f003e0f Clang: Distinct warning/error icons
Similar shapes, but hollow.

Change-Id: I72f39d1bc701c28c8bc0b038f646904efe1e67b0
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-02-08 12:41:28 +00:00
Orgad Shaneh
8754cab9aa Todo: Support find in pane
Change-Id: I9788a81395d55b54e1e25c9315a07965fffd37ee
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-08 11:38:39 +00:00
Tobias Hunger
babb93a682 CMake: Fix WS issue
Change-Id: Ic3f59f4c9a5337c1189696fde8fe49ba711265f3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-08 11:14:38 +00:00
Tobias Hunger
33465ce2be Use Utils::TreeView in EnvironmentWidget
Change-Id: I43c0a39d102d3cf569b4a3c073af393a0a15c68a
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-08 11:08:27 +00:00
Christian Stenger
4a3b63c1d9 AutoTest: Remove unused code
Change-Id: I54a4666ab4619059fc5ad7a2597e10344c376a5b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-02-08 10:27:02 +00:00
Nikolai Kosjar
ea67bdb823 ClangStaticAnalyzer: Ensure to pop up the issues pane on errors
...at the end.

For cases where msvc parses/compiles fine but clang not, the issues pane was
not always shown in the end.

Task-number: QCE-62
Change-Id: Iab979b664e37dc7b35c2418566a7af74a4907829
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-08 09:37:23 +00:00
Friedemann Kleint
e6a572e07a Extension system: Extend error message for invalid test functions.
Output the list of available test functions.

Change-Id: I86578b9eeaa2f4cd5782de7ea2d90fae06e22542
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-08 09:31:49 +00:00
Christian Stenger
5f69a505ec ClangStaticAnalyzer: Fix flaky tests
The same problems we had on Windows (started() emitted before
QSignalSpy::wait() called) occur also on OS X.

Get rid of the QSignalSpys completely and watch out for the signal
emissions manually.

Change-Id: I092126c6605b046f250999b8ff04d11e685297c2
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-08 09:06:53 +00:00
Alessandro Portale
5bed03ffd8 QmlDesigner: Improve Section collapsing animation
Making the height animation work. Synchronizing height animation and
arrow rotation.

Removing the well meant fading, because gives the impression of a lag
rather than an intended animation.

Change-Id: I97924c715476df72ff903d38277730ca0e02e80d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-02-08 09:01:20 +00:00
Orgad Shaneh
5db0ef191e Git: Do not report canceled for Grep when no results were found
Change-Id: Ib1916c345bd345ee3dd5179c84bb259c2992303e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-08 08:07:58 +00:00
Orgad Shaneh
9117b28eb1 VCS: Fix find in output pane
It is instantiated in several locations. Move the find support to its ctor.

Change-Id: I77b05eff2889d0b8b801eef38d701ca4af3eefda
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-08 08:03:30 +00:00
Orgad Shaneh
215654b574 AutoTest: Fix execution of Gtest
Change-Id: I7e358b31eea41e1896a43c5efb9a9336ec127c33
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-08 06:38:02 +00:00
Christian Kandeler
fb181b0911 Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: I42a6d9dc47a2088a62451ea42a9cf1b0ee50e08d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-02-05 16:33:42 +00:00
Marco Bubke
5c10c5ff24 Clang: Fix indention in ClangPreprocessorAssistProposalItem
Change-Id: Iffe01fe06d3fbed192e3f1875431337c49147800
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-02-05 13:28:54 +00:00
Christian Stenger
3f760bad1f AutoTest: Avoid temporary storing of QMap
Change-Id: I099ffb6931947f72ad242e858d82a109a0da85f9
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-02-05 13:12:06 +00:00
Christian Stenger
6ebd3cc7e8 AutoTest: Trigger onPartialParseFinished directly
Change-Id: I291712b5820c5bf84ee92621bc91497ec4264709
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-02-05 13:12:01 +00:00
Christian Stenger
02e188c3fd AutoTest: Trigger signal by QFutureWatcher
The finished signal might be triggered before the started.

Change-Id: Id23612553fdd19de2ddbee72b20b4e85448e1611
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-02-05 13:11:57 +00:00
Christian Kandeler
53483fd82f Fix qbs project file for json library.
Change-Id: I45e5427e406973bfa880832ed32c41c92fe3a0d1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-02-05 12:27:41 +00:00
Orgad Shaneh
9a723a0c98 Utils: Fix indentation in ShellCommand
Change-Id: Ia93d5f50c4ea1e130ddfafe763fe0bd5cc95fad1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-05 11:55:39 +00:00
Orgad Shaneh
36d5bc1e98 Git: Use VcsCommand for Grep
* Logs the command in the Version Control pane
* Simplifies the client code

Change-Id: I398d57ab12ed6ba6bab1878934b929083f0bf6cb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-05 11:55:20 +00:00
Tobias Hunger
6bf90bb793 EnvironmentKitInformation: Print nicer
Print the environment variables in the tool tip nicer.

Change-Id: I3d8d40f470dc552125901e237734b24d34b38608
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-05 11:47:49 +00:00
Tobias Hunger
999a8d0516 CMake: Polish CMakeKitInformation
Change-Id: Ifc22c5ad41449ce6597b604746f25cab86662425
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-05 11:47:37 +00:00
Tobias Hunger
5404f9c480 CMake: Remove static defaultValue method from CMakeKitInformation
There is no need to expose this.

Change-Id: I164f1e787b742d330282125320b54a5b2ecb6134
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-02-05 11:47:23 +00:00