feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
44,854 Commits 108 Branches 368 Tags
550a11a876e93df2bc9871ee4308d807e26b714c
Commit Graph

44854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hjk
e7132f6714 Valgrind: Remove unneeded 'slot' markup in CallgrindRunner 
Change-Id: I1f4b6855cc3fc3a418e26f4900c3fd439cfa6f36
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-02 15:41:35 +00:00
Friedemann Kleint
9be9fcc7fc IOutputParser::setChildParser(): Do not connect to 0. 
Fixes warnings:
WARN  : ProjectExplorer::ProjectExplorerPlugin::testMsvcOutputParsers(Multiline error) QObject::connect: invalid null parameter

when running:
qtcreator -test ProjectExplorer,testMsvcOutputParsers

Change-Id: I07285b43873d76d67fcb0a67a9955d95ec1ac267
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-02-02 15:30:21 +00:00
Tobias Hunger
da05ddc339 Debugger: Remove assert 
It is perfectly valid for a kit to not have a debugger. Do not
soft-assert in that case.

Change-Id: I89b7a125935188c0ce9479ea68cd403b59e72563
Reviewed-by: hjk <hjk@theqtcompany.com>
 2016-02-02 15:29:52 +00:00
hjk
3f4d107b0b Valgrind: Remove runtime dependency to RemoteLinux 
Not needed anymore. The combination works nevertheless.

Change-Id: I3e24be38061b78b1d107eed5b2f1ae4cc1cfc64f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-02-02 15:28:53 +00:00
hjk
da9c027003 DeviceApplicationRunner: Remove unneeded references to ssh 
Compiles fine with the generic base classes.

Change-Id: I39b669a1c85379ca938d35d753a19debb1fd59cd
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-02-02 15:23:02 +00:00
hjk
92079ab5d5 RemoteLinux: Remove RemoteLinuxRunControlPrivate::runnable 
Instead, use the copy in the RunControl base class.

Change-Id: Ib72876b131236de8cb8f5cecbad9ec381d7e0e3e
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-02-02 15:22:52 +00:00
Friedemann Kleint
90074022f0 ProjectExplorerPlugin: Mark tests as private slots. 
Otherwise, they cannot be run from the test system.

Change-Id: I6137548b20718b44565281edcd55f48667054878
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-02-02 15:17:46 +00:00
hjk
5973484de4 RemoteLinux: Remove RemoteLinuxRunControlPrivate::device 
The base RunControl has now a copy of its own.

Change-Id: Ic830015603975891ef96335518f39b4cf032f29f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-02-02 15:13:39 +00:00
Tobias Hunger
9d40a1d920 TextEditor: Fix warning about missing override 
Change-Id: If24db77c644d0b7cf0e27fd18818f0671572fabc
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-02-02 14:47:05 +00:00
Tobias Hunger
412dd23e0f ProjectExplorer: Simplify code a little bit 
Use an QTC_ASSERT in favor of an if. This may not happen.

Change-Id: I4e8d58210f9caff9b8ae7d0fccf764d8ceeace9e
Reviewed-by: hjk <hjk@theqtcompany.com>
 2016-02-02 14:46:47 +00:00
Christian Stenger
26c7afdfb7 TextEditor: Fix compile with gcc 4.7.3 
Change-Id: I59b401c4d7a75398fddc8f6e3a0671fc49f0cb47
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2016-02-02 14:40:14 +00:00
Tim Jenssen
de28ab0a6f QmlDesigner: using pragma once at formeditor files 
- also clean up some empty lines and include orders

Change-Id: Ia076951a6b0060ae70c53f213bdb5d6a12abd319
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-02-02 14:30:56 +00:00
Tim Jenssen
a75a97db1b QmlDesigner: use unique_ptr for tool classes 
Change-Id: I73db95aca8d082943f076d243db3926f560209f1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-02-02 14:30:48 +00:00
Christian Kandeler
94ceccd0eb Utils: Fix qbs build. 
Qt 5.6 no longer pulls in the pthread library.

Change-Id: I8b266cf89e9e05aaff3d7cd5ea36707e49e8ccdb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-02 14:22:13 +00:00
hjk
dcfb622126 Valgrind: Simplify device setup and handling 
Make isLocal() less intrusively used and correct.  Use the stored device
more often, also handle errors more quickly.

Change-Id: I146d1f5788ea79d0a9d7b058c81908d451cf00d0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-02-02 14:14:02 +00:00
Christian Kandeler
d14257736e Sqlite: Add additional Utf8String::operator==. 
There was operator==(const Utf8String &, const char *), but not the
counterpart with the argument types switched.

Change-Id: Ie9ef5c21da0c39881ecad7ea080b87eefe6c4d02
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2016-02-02 14:03:04 +00:00
hjk
f1139b1d51 QmlProfiler: Remove some dead code in RunControlFactory::create 
The check is covered by canRun().

Change-Id: Id2360a5d2cb2fd915e164a6b5a533f008fe670f1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-02 14:00:19 +00:00
Christian Kandeler
1931987ac3 TextEditor: Fix qbs build 
Change-Id: Iaf2145047fd7901472f6b5af205572cf0db2ccbc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2016-02-02 13:11:51 +00:00
Tobias Hunger
96fa09bb4f Qmake: Set a rootProjectNode early. 
This one covers the time between a QmakeProject being constructed and
has its settings read or is being parsed.

Change-Id: I64d6a9d39b1e188d2af10c58135ab9174af8d701
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-02-02 13:02:59 +00:00
hjk
0ffbb5a041 Valgrind: Postpone the decision on whether its a local run 
The decision is wrong anyway, no harm done. Move it closer to a
location where it can be done correctly.

Change-Id: I92de8ffec92cae6b3de3322d5045b696ae62932f
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
 2016-02-02 12:33:18 +00:00
Tim Jenssen
678d142497 QmlDesigner: add scrolling via space + mouse 
Change-Id: Ia6377114267fe0f708826b5a9ea43d7c46998a17
Task-number: QTCREATORBUG-11321
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-02-02 12:31:25 +00:00
Tobias Hunger
c0e00a05e6 Qmake: Do not soft-assert when a pro-file is not part of a project 
This can happen.

Change-Id: Id8c077592ecc77b5d774cf60dc1faca4e5dbead5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-02-02 12:26:31 +00:00
hjk
7d46521e3a RunControl: Store a IDevice 
Some information on where the thing is running is needed, IDevice
seemms to be the common denominator.

Change-Id: If6528e0deb118cedf5ccd06f6830b4afd3153473
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-02-02 12:25:05 +00:00
hjk
2fd286cc93 ProjectExplorer: Use runnable contents for appoutputpane re-use 
Change-Id: I6dd4b9258321a23462bb6488b132aa9f3d1ed5c2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-02-02 12:24:56 +00:00
hjk
e4dca97fc6 ProjectExplorer: Pimpl RunControl 
It is a fairly central exported class, no need to expose storage
details to user code.

Change-Id: Ibe199969450bc30b46ab7500e04a22300c492f2c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-02-02 12:23:34 +00:00
Thomas Hartmann
51661d4da9 Remove QmlDump source 
QmlDump was replaced by qmlplugindump.

Change-Id: I553864756356f5cf591195b6b3f50f467ba53f59
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
 2016-02-02 12:20:17 +00:00
Christian Kandeler
40dfb0dcf3 sqlite: Fix qbs build. 
Qt 5.6 no longer pulls in the pthread library.

Change-Id: I2059990ba55389e6f5cfe471e15bfc56920a7a5f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-02 12:17:21 +00:00
Marco Bubke
cc1ed420c2 Clang: Break dependency to visible Core::EditorManager::visibleEditors() 
Change-Id: I4157cd190a8c00b07c0e2f3eeeab18409f2405b7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2016-02-02 11:56:23 +00:00
Marco Bubke
e134dfcad4 Clang: Remove project part dependency in IpcCommunicator 
Change-Id: I312f4a3721c045ae4b4ed4b72218201dbb38aa4b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2016-02-02 11:56:16 +00:00
Marco Bubke
07e8edb4fe Clang: Remove ClangEditorDocumentProcessor from ClangCompletionAssistProcessor 
Change-Id: I15b0124b980b0df974cc4405b5834919659d6834
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2016-02-02 11:56:06 +00:00
hjk
f56363f07b ProjectExplorer: Avoid recently introduced crash when switching kits 
LocalEnvironmentAspect needs to take care of being cloned.

Task-number: QTCREATORBUG-15700
Change-Id: Id040a2a150dbc1cd3e407aa3d7dfc2728d7bb3db
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-02-02 11:53:34 +00:00
Marco Bubke
f41c6b0c4b Clang: Remove TextEditorWidget from AssistProposalItemInterface 
Change-Id: I0ac924f88c1347d1b0027c47118b7ed21daf4869
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
 2016-02-02 11:26:58 +00:00
Robert Loehning
8c13f2437e Squish: Increase timeout in tst_git_first_commit 
Change-Id: Id65b729cd200bb37ad132b4071a263ab61bb3ed8
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-02 10:19:12 +00:00
Tim Jenssen
a0cc107b74 QmlDesigner: use changeCurrentToolTo everywhere 
Change-Id: I1b30cc1e9a5b1d62441719d006aa9a9c3c991aa4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-02-02 10:11:24 +00:00
Christian Stenger
1ab0a64089 AutoTest: Restructure settingspage 
Change-Id: I6b5a0bcddd6243a8725d60aedebeba7bd86b137b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
 2016-02-02 10:05:22 +00:00
Friedemann Kleint
bba4c33fe6 README.md: Add some Windows/Clang instructions. 
Change-Id: I3c854d7a932951d8340507c4799591bbccb179ef
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2016-02-02 09:51:10 +00:00
Nikita Baryshnikov
f3ff4ba316 Clang: fix compile error 
avoid adding -L/usr/lib to linker options. To avoid linker errors with
Qt from system and from own toolchain.

Change-Id: I291943e6b17c2bf17eb0700b0fc0cda435588ad5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2016-02-02 09:28:58 +00:00
David Schulz
182bd0b34e Editor: Fix compiling of editor overlay. 
Introduced by 0532c94758 .

Change-Id: Ia10c09a44012649ffab4fa35d0f1ac20d2233474
Reviewed-by: hjk <hjk@theqtcompany.com>
 2016-02-02 09:10:13 +00:00
David Schulz
0532c94758 Editor: Avoid using private text document handle. 
Task-number: QTCREATORBUG-15238
Change-Id: I6c7636ac4762c48c53767beaa97b0ce567f87dd1
Reviewed-by: hjk <hjk@theqtcompany.com>
 2016-02-02 07:10:00 +00:00
Nikolai Kosjar
03e6b15532 TextEditor: Fix compilation with MSVC2013 
Change-Id: I0392c6f0256acc4dfcd14c793f7791a9142edd79
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
 2016-02-01 16:01:16 +00:00
Nikolai Kosjar
984e82b525 Clang: Fix compilation with MSVC2013 
Change-Id: Iac0a025c3cb5c59d0da4c83d4fd60794a2911ea4
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
 2016-02-01 16:01:12 +00:00
Orgad Shaneh
d67a855102 QmakePM: Enable "Run in Terminal" by default for console apps 
Broken by be4aba7dc2.

Task-number: QTCREATORBUG-15632
Change-Id: Iccc7f03c3d0cf0295fd235c23240345e713c1b20
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-02-01 15:51:47 +00:00
Orgad Shaneh
048a5cb63b QmakePM: Factor out project node lookup 
Change-Id: Ied97f86b7a39d9d680160ec7a0b8b6ea8d0330be
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-02-01 15:51:44 +00:00
Orgad Shaneh
15f8bb07ed ProjectExplorer: Use Qt5-style connects 
The heavy lifting was done by clazy.

Change-Id: I619db09a79760186b72e7662490ed1205155c1a7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-02-01 15:51:34 +00:00
Nikolai Kosjar
db8b9f9463 Clang: Fix variable name in test 
Change-Id: Ief210920c62710786cf75fd6aea04897f4e2965e
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
 2016-02-01 15:17:11 +00:00
Eike Ziller
ef1203b75c Merge "Merge remote-tracking branch 'origin/3.6'" 2016-02-01 15:16:12 +00:00
Eike Ziller
5952165cf9 Merge remote-tracking branch 'origin/3.6' 
Change-Id: Ic4d3d94feaaa588c6244509bb3dd14c5cb646fe7
 2016-02-01 16:15:48 +01:00
Marco Bubke
ecca269292 Clang: Add ClangPreprocessorAssistProposalItem 
Change-Id: Ifb27b9a21b9a2fe9a04496bbb70fa3fa07d1f89c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2016-02-01 14:38:31 +00:00
Christian Kandeler
e432c715dd TextEditor: Revert adaptation to reverted QTextCursor API change. 
Change-Id: I1f778f6389adc6937330b727006ad89880328cb5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
 2016-02-01 14:25:00 +00:00
Marco Bubke
bb3b7307ef Clang: ClangAssistProposalItem is now inheriting AssistProposalItemInterface 
Change-Id: I781ba27659e852782292596fe590666b09d7253e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2016-02-01 14:01:44 +00:00