Commit Graph

44854 Commits

Author SHA1 Message Date
hjk
077079cf2a ProjectExplorer: Introduce Runnable and Connection concepts.
A 'Runnable' contains (possibly target-specific) data to describe
something that could be run (e.g. a remote executable with
arguments, working directory and environment). A 'Connection'
contains (possibly target-specific) data to describe a connection
to target that will be used to run a Runnable.

Runnable and Connection objects are used in the target
RunControlFactories and are opaque to the project explorer.

Change-Id: I2293dffa71148646cfb52c9b582ccd2675b145a8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-20 09:23:42 +00:00
BogDan Vatra
f3262b4ddc Add androidExtraLibs paths to solibSearchPath
Change-Id: I6935681fd22350f7ab849a0ad2ca34d473a0b95b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-20 09:19:54 +00:00
Tobias Hunger
dc8a12780f QmlProfiler: Fix warning during build
Change-Id: Ibfb33a67ee431159bdbe132ecd5cdce95cf6add8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-20 09:02:16 +00:00
hjk
261c54c4a2 Core: Move icon construction out-of-line
Saves 80k object data per file, for more than 100 files
(-O2 -g on Linux x86)

Change-Id: Idf30edb4ca0c26054a9aab731c4810dc218dce3e
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-20 07:17:19 +00:00
hjk
aac1fa5e9f Utils: Remove deprecated use of style options
Change-Id: I4403e459f700d2cc52f7d475a9c6d89ab2896485
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-20 07:05:36 +00:00
Alessandro Portale
dc6968d1b8 default.creatortheme: White flat & active icons
Looks better.

Change-Id: If7a243b5430dc510c7687bfe08e58c8c6ce26215
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-19 18:23:09 +00:00
Tobias Hunger
38cce7eb83 Update License according to agreement with Free Qt Foundation
* Update all files in share folder

Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-19 16:05:29 +00:00
Tobias Hunger
954569387c Update License according to agreement with Free Qt Foundation
* Update license information in tests directory

Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 16:01:06 +00:00
Tobias Hunger
f72370f20a Update License according to agreement with Free Qt Foundation
* Update remaining files in src

Change-Id: I1896f17fcf34f71c3310c87899fb5171b8e4afb1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:59:41 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:57:01 +00:00
Tobias Hunger
1b4321279f Update License according to agreement with Free Qt Foundation
* Update files in src/share* and src/tools

Change-Id: I78aa5d4a1d76212964e467de7676c1fcb2b777d6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:48:57 +00:00
Alessandro Portale
333b7d2041 Core: Make a message box title capitalized
Change-Id: Iddbf6224a30d154af7b7216be13e795ae41f3ccd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-01-19 15:48:22 +00:00
Tobias Hunger
b1f757af23 Update License according to aggrement with Free Qt Foundation
* Make sure all scripts come with a license
* Update the license in the scripts
* Add scripts to help with license changes

Change-Id: I38a25aa1287ee8a75e0f0307d1b30320d781ad1f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:44:55 +00:00
Eike Ziller
98257617e9 Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/plugins/clangcodemodel/clangassistproposalmodel.cpp
	src/plugins/clangcodemodel/clangassistproposalmodel.h

Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715
2016-01-19 16:41:17 +01:00
Tobias Hunger
aa37df645d JsonWizard: Update to use supportedProjectType
Remove "kind" as that is no longer necessary (even though it is still
handled if that is in the wizard).

Change-Id: I3e56d5e0d936b622dae5091950427f9b2db60695
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:20:55 +00:00
Tobias Hunger
4fde1b5501 Wizard: Make wizards report which type of projects they can support
Use that information to decide whether the wizard is a File or ProjectWizard

Change-Id: Ie630e206317c7e01e77c811819cb95b360a04e09
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:19:51 +00:00
Tobias Hunger
cc817d508f SDKtool: Make sure to use '/' as path separator
All internal paths in Qt Creator are using '/' as path separator.
Make sure to normalize paths set via the SDKtool to that convention.

Change-Id: If7ef250d49686a0f60d08516b718eb7c84a059ef
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-19 15:15:57 +00:00
Friedemann Kleint
f8d4e4954b Fix const-ness of ClangCodeModel::Internal::CompletionChunksToTextConverter::inDesiredTextFormat(().
Change-Id: I622b65d7d8fd90d67863282fe85b867acf16b899
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-19 14:55:33 +00:00
hjk
a67c7d5bf0 Analyzer: Introduce a convenience AnalyzerManager::createRunControl
... using a dummy AnalyzerStartParameters class as intermediate step
to remove AnalyzerStartParameters entirely.

Change-Id: I85663362e6b4f45d8e13f7928009bca05932eb99
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-19 14:40:27 +00:00
hjk
4052573db2 RemoteLinux: Remove unused class declaration
Change-Id: I2ba60ac5f56e1c4c401b0e25354608dad3bb73fb
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-01-19 14:40:11 +00:00
Tobias Hunger
d5e7262e68 Wizards: Better selection of project wizards to show
E.g. only show wizards that can create qmake projects when
contining after a SUBDIR-project wizard.

Change-Id: Ib189b1efa479f5b986fdec8658715245e2f2db40
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-19 14:37:38 +00:00
Friedemann Kleint
01f144d514 Fix display of MSVC2015 in compilerString().
Display values of _MSC_VER >= 1900 (currently displayed as MSVC 2014)
as MSVC2015 and larger values as unknown.

Change-Id: Id23b0f9342e6ad6d776bb44743e5e4ce91462c8f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-19 14:29:53 +00:00
Eike Ziller
3b423602ed Report test results through QFutureInterface
Change-Id: Id5704ff2744ee925978c518f44069b26c66d682e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-19 14:24:04 +00:00
hjk
9e16554e25 Debugger: Be a bit more robust with LLDB disassembler
LLDB 3.8 on Linux claims non-existent files to be the source of
disassembly.

Change-Id: I45a47cf5e7faad7ccd6dbb9879c8328fc2496b95
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-19 14:22:39 +00:00
hjk
0983c7cc1a Ios: use ArgumentsAspect in IosRunConfiguration
Change-Id: I9f2f0eacf5fca155912eb4417d2ac89afcf64901
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2016-01-19 14:04:23 +00:00
Nikolai Kosjar
5691156b35 Clang: Fix inserting "::" after namespace
The extra "::" is showed in the tooltip right to the completion list
item, but it was not inserted.

Change-Id: I0ad2b816c56b8e3b5ccf0643f2c1a4f2a20b8818
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-01-19 13:37:10 +00:00
Nikolai Kosjar
2324db9d41 Clang: Fix html code in completion list item
E.g. "dynamic_cast&lt&gt;()" showed up as item.

Let CompletionChunksToTextConverter default to plain text format and
explicitly request HTML where needed.

Change-Id: Iebce85cb888a5bd697ffdce364118b6dc65a435d
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-01-19 13:37:06 +00:00
Nikolai Kosjar
a071e52b94 Clang: Extract duplicate code
Change-Id: I476916f825ab475f77f918127217dfc33eb4f388
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-01-19 13:27:55 +00:00
Nikolai Kosjar
1a6b62a2b0 Clang: Fix text format for completion details
The tooltip text right to the completion list item is prepared for rich
text (html) interpretation, but the QLabel the text will finally be
displayed with has no explicit text format set and thus defaults to auto
detection. The auto detection works fine for e.g. "<i>int optionalArg</
i>" but fails for "const Foo&amp;".

Task-number: QTCREATORBUG-15630
Change-Id: Ia58d65ee542730e4823c69150d452cdde98112f8
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-01-19 13:27:30 +00:00
Nikolai Kosjar
8d6549fa74 Clang: Correct member access operator if possible
1 struct Foo { int member; };
 2 void f(Foo *foo)
 3 {
 4     foo.<REQUEST COMPLETION> // correct '.' to '->' and provide results
 5 }

The preferred approach would be to check if "foo" in line 4 is of
pointer type, but there is no suitable cursor (only CompoundStmt) at
that position since the code is usually not yet parsed and thus invalid.

Thus, just run the completion as is. If there are not any results for a
dot completion, re-run the completion with "." exchanged by "->". This
approach is inherently slower than the preferred approach implemented in
the built-in code model.

The following rare cases are not handled:

 1) Requesting completion after white space:
      Works: foo.<COMPLETE HERE>
      Fails: foo. <COMPLETE HERE>

 2) Opening a file and requesting completion (ctrl+space) without prior
    editing. No editing before triggering completion means that no
    unsaved file is generated on the backend side, which is a
    requirement for the correction.

Task-number: QTCREATORBUG-11581
Change-Id: I6bc8e8594778774ab342755fdb01a8a3e5c52ba0
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2016-01-19 13:20:35 +00:00
Tobias Hunger
43800a6aa8 Update License according to agreement with Free Qt Foundation
* Update license in documentation files. Stay at FDL, but update
  URLs as well as license for examples, etc.

Change-Id: I5e8cb5a20f0e9d52fba1d937b7c73197d69dd747
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 13:09:03 +00:00
Thomas Hartmann
6dd80accff QmlDesigner: Remove unused file
Change-Id: Ife567cfb368092f818c7cf418ede4ab1bca227aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-19 12:38:21 +00:00
Thomas Hartmann
ea767d961b QmlDesigner: Remove unused file
Change-Id: Ife567cfb368092f818c7cf418ede4ab1bca227aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-19 12:37:59 +00:00
Thomas Hartmann
17e5cd7085 QmlDesigner: Fix crash in qml2puppet
We should not call updateDirtyNode() for items without a window.
This will assert later in consistency checks.

Change-Id: Iff3574123a1497206de88d59fcf630ead57ef593
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-01-19 12:04:44 +00:00
Christian Stenger
ca8f7c56cd Remove bold tag from test summary
In some themes this becomes hard to read.

Change-Id: If703355c1b76f3120f29c1e3ca1363f502d23865
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-19 11:53:56 +00:00
Christian Stenger
dc4e955126 Fix construction of source file for test results
Change-Id: I9dff118aa8f8871812e1881f0c73220d56ab16d5
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-19 11:53:51 +00:00
Eike Ziller
06e02480f4 Use Utils::runAsync instead of QtConcurrent::run
QtConcurrent has the issue that it uses a globally shared thread pool,
with no finer granularity for simulataneous tasks.

Create an explicit event loop for the test runner for that.

Change-Id: Idcf2f125e111d94a5a60e5b136fd875225326e14
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-19 11:52:07 +00:00
Eike Ziller
9a3efd4950 Don't show focus frame on OS X
The focus frame needs a border around the view, but there isn't.

Change-Id: I9d7b206445be9f8e43bd9168ccea2075f4ac4bb7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-19 11:51:59 +00:00
Ulf Hermann
75aa1d26ac TextEditor: Support contents() and contentsChanged()
Change-Id: Ia1957d489b8bf2b42c69f739913b50e52e488a69
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-19 09:33:42 +00:00
Ulf Hermann
7129cb0b7d Add support for contents() to designer documents
Change-Id: Ie8c65c7a692d752bac3b6427f66116282b486576
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-19 09:33:27 +00:00
Ulf Hermann
5182f2ffb2 Core: Add methods to retrieve contents from IDocument
This is very helpful for dynamic extra compiler support (e.g. uic,
flex, ...).

Change-Id: I5a49b0b39a0f1fbc7834701d60a68ef441172969
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-19 09:33:17 +00:00
Christian Stenger
d0b258a5df Make TestRunner more thread-safe
Change-Id: I42e5c9e26a45ef2875cf70e1c5e3b989bcce4de8
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-19 08:11:19 +00:00
Eike Ziller
fc485e6b86 Add default implementation for IDocument::fallbackSaveAs(Path|FileName)
The methods are only relevant for documents without a filePath, and
there was a mix of different irrelevant implementations present in
subclasses.

Change-Id: I4f57d306e5ddd913974cfe6ed0b4db062eb907a1
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-01-19 07:55:56 +00:00
Orgad Shaneh
24f5bc7d3f Utils: Add a soft assertion in HistoryCompleter
Change-Id: I8319366bb84f00dc338dcea81233b69b6a116d66
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-19 07:21:59 +00:00
Orgad Shaneh
02c4f0dd88 FindInFiles: Use Utils namespace
Change-Id: I7f61ee40ecb84b594018a04062c702bb36ad4510
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-19 06:59:38 +00:00
Eike Ziller
6513fc88b3 runAsync: Allow calling member functions
Change-Id: Ide09b5585730fb3dcb4a18718a02a4d8351ef91e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-19 06:07:43 +00:00
Eike Ziller
4b077921e2 runAsync: Allow function references, and non-const parameters.
Change-Id: I258259da7767087a8319d6a4489aa4d6c3b32c6f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-19 06:07:33 +00:00
Eike Ziller
e90ef40336 Add auto tests for Utils::runAsync
Change-Id: I59494d410ec529fd9689c64fea299ada6f6a472b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-19 06:07:23 +00:00
Eike Ziller
6b5f525da0 VcsBase: Remove unused includes
Change-Id: I5a71e72907e96402f3b88aa2a05c333f0bb56030
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-19 06:06:55 +00:00
hjk
e7956000df RemoteLinux: Use QString instead of QStringList for process arguments
This is almost uniformly used everywhere else.

Change-Id: I1ef9abb24066b21652aeb994b18ea3e19f48b3c6
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-01-18 16:35:40 +00:00