Commit Graph

40584 Commits

Author SHA1 Message Date
Orgad Shaneh
ec9b42fe98 Git: Fix filtering of date/time in blame
Was broken in 07d6757ca8.

Change-Id: I2372d3856d52c01949554aed6ed133de8eabd814
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2015-04-12 20:05:33 +00:00
Orgad Shaneh
4eb2224f47 Git: Add override
Change-Id: Iae0779c1efa8b3b46cf504f7bda00d614a4a157e
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2015-04-12 20:03:04 +00:00
Orgad Shaneh
aedfbd5710 C++: Extract TypedefsResolver out of ResolveExpression
... and rename it TypeResolver

Change-Id: I5cb076812d2e3ac132f18ea884ec69328b69999c
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2015-04-11 17:27:44 +00:00
Orgad Shaneh
7ba2210102 CppTools: Add failing tests for recursive instantiation
Task-number: QTCREATORBUG-14237
Change-Id: I59ae931994ef6577010a4544219ba3b0cd85c677
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2015-04-11 17:27:39 +00:00
Daniel Teske
c2a2c4c819 Coding guidelines: Add various C++11 features
Change-Id: I9d3ca28bf8d5d04e04464757420a3c8e30f5dac0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-10 14:21:02 +00:00
Tobias Hunger
088e5b6462 Vcs: WS cleanup
Change-Id: Ie5a436904ec787910ae6e4d01778ee615909feef
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-10 14:16:43 +00:00
Tobias Hunger
ee7d0a7bf7 DiffEditor: Do not load settings when splitting views
Change-Id: I7fac89714ff9a603af29e19664b091e5e62be22f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-04-10 14:14:57 +00:00
Tobias Hunger
0f5fdbe0f2 Git: WS fix
Change-Id: I0b4d37ae8ccd5f5edd8f049d31519be7d2131036
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-10 14:14:47 +00:00
Tobias Hunger
68045c1d0d Vcs: Move resetCachedVcsInfo into VcsBaseClientImpl
Change-Id: I544472d2024bd82039908c67ab133556617b4fdb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-10 09:58:39 +00:00
Tobias Hunger
07d6757ca8 Vcs: Move createCommand and enqueueJob into VcsBaseClientImpl
Change-Id: I86a4ddfd6c53a3be61c56579d8eaf5d49258a8f1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-10 09:49:47 +00:00
Robert Loehning
3f6f987dce Raise minimum Qt version
Now even in README

Has been forgotten in 9d86b7ed4e
and 403008cc27 .

Change-Id: I12c3588b85aa3a8a28b2a4be42603e52f915a427
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-09 15:13:16 +00:00
Daniel Teske
08c573fb0d QmlProjectManager: Remove dependency on qt quick 1 in a test
Seems it wasn't actually required at all

Change-Id: I4c622057b7fd85a64f99368eb07b502aee524955
Task-number: QTCREATORBUG-14217
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-09 14:50:34 +00:00
Orgad Shaneh
2eec1ec04f BinEditor: Use QByteArray::toLower
Bug was fixed in Qt 5.4 (5d11688d02e1f56722dce809cbe7ab5c49fea590)

Change-Id: I9863bf31ac3f6e238ff5c851993d148b1b8710cf
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-09 13:48:12 +00:00
Christian Stenger
403008cc27 Raise minimum Qt version
Has been forgotten in 9d86b7ed4e.

Change-Id: I4725d98d87b4cd44b363a15d5cdcc61eac4e13f0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-04-09 11:50:53 +00:00
David Schulz
24d784b06a Editor: Draw line numbers before text marks.
Task-number: QTCREATORBUG-14178
Change-Id: Id7c29d958194b1337316cd550211c5089e719ccb
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-09 07:42:37 +00:00
Tobias Hunger
2ccae82b5c Vcs: Move vcsBinary and vcsTimeout into VcsBaseClientImpl
Change-Id: Ib14432c85f42606a0437f3848b9dfa2fe63fb2f3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-09 07:25:17 +00:00
Tobias Hunger
73a7732850 Vcs: Unify options pages for VcsBaseClientImpl based VCSes
Change-Id: Ia5dd7746f5857e7254251e3510c0987737cfad6d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-09 07:25:11 +00:00
Christian Stenger
9d86b7ed4e Raise minimum Qt version
Needed for supporting more C++11 features.

Change-Id: Ib3ab63b2698c86a1ad0153c3e4bead09cccdefca
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-09 07:01:57 +00:00
Nikita Baryshnikov
9b9c35fd8a BinEditor: metion that bug in QByteArray::toLower was fixed
in Qt5.4. Could be fixed once we will drop Qt5.3

Change-Id: I7a121e07dcfd2cfd2749cfcd9a02dd178d733361
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-08 10:22:38 +00:00
Nikita Baryshnikov
85c8ddddd6 BinEditor: remove unused members
stale include and unimplemented member function

Change-Id: I4af50dc4d5f7b397a9d5dda7947c61dd950b375c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-08 10:18:07 +00:00
Tobias Hunger
4f7844d6f5 Git: s/GitPlugin::gitClient/GitPlugin::client/
... same name as with almost all other plugins.

Change-Id: I964159044d86685735e8b1e816a0bf67e0576fd8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-08 09:52:25 +00:00
Tobias Hunger
90ce38da39 Vcs: Move handling of settings from VcsBaseClient to VcsBaseClientImpl
... and update users of that functionality accordingly.

Unexpected plus: Now every supported VCS actually saves their setting
when requested.

Change-Id: I02db7b2ce14e5f52d26409b2a01aea290c2a294a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-08 09:30:44 +00:00
Alessandro Portale
d3100774f9 Debugger: Use QJson* instead of QScriptEngine for json handling
That lets us remove the dependency to QtScript

Change-Id: Id80bebf658abee814d92210219d86a015629d32c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-08 09:24:23 +00:00
Eike Ziller
f311eff157 FileSearch: Fix wrong line number for RegExp search.
Introduced by recent refactoring

Change-Id: Ifb7300549ce1791a90d287d5d8dd66f7d2217755
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-08 05:10:49 +00:00
Marco Bubke
789f3d6ca2 Change templates for Quick file wizards
A Item is more light weight than a Rectangle and using it against a white
background is useless. Actually Rectangle is not very much used so Item
is a better default. Width and height are dangerous too because people
exchange them with bindings instead of using anchors or layouts.

Change-Id: I4a89ddfc0f96fb3cdb0a9ccad7fcf80b8f28b479
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-04-07 11:37:02 +00:00
Tobias Hunger
03ac09d34c Subversion: WS fix
Change-Id: Ifc8d46086fd4228b80bc42859aba84819650777f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-07 09:58:59 +00:00
Leena Miettinen
138d009cc7 Doc: Inspect API for Element Under Cursor function
Change-Id: I8fbc3d61bdda51fc40e671d694b717622713c5f8
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-07 07:13:49 +00:00
Leena Miettinen
6b27bcefb4 Doc: enabling and disabling plugin dependencies
This now happens automatically and disabled plugins
are no longer a problem after version upgrade even if
plugin dependencies have changed.

Change-Id: I06456c81c2ad2fab5730562a4df407cf178fd1cf
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-02 14:52:04 +00:00
Christian Kandeler
549590a249 Core: Fix qbs build.
Change-Id: I2a9a8f0bf61b61a6d2cd1e9e2c6bfe2b23b10b8e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-02 10:24:27 +00:00
Eike Ziller
e56118cc1e Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/libs/extensionsystem/pluginview.cpp

Change-Id: I316199fe0a257cb085668ccb183b1590555278f2
2015-04-02 11:56:55 +02:00
Eike Ziller
fd0b383932 About Plugins: Fix sorting by "Load" column
Change-Id: I705a717ff13e23bafcffb0d41edceab95d3607e6
Task-number: QTCREATORBUG-14107
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-02 09:53:06 +00:00
Kai Koehne
46fc33d914 Don't mix iterator and const_iterator
This avoids unnecessary detaches of the Qt container data.
The mismatches where detected by defining QT_STRICT_ITERATORS;
however, this define violates the ODR (causing linker errors),
and therefore is not added permanently.

Change-Id: Idd336a9c8b394214a820437ef1b92d2101f6101c
GPush-Base: 62b0848b9c
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-02 09:40:24 +00:00
Leena Miettinen
87e01423c9 Doc: Add documentation for CPU Usage Analyzer
Change-Id: I306a009dceba74707b5802b18451c7ae912adac9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-02 09:05:19 +00:00
Eike Ziller
97631c25df Fix build after fb9cea18a8
Change-Id: Iafafcddfe5de8b4a16d6b4d9538b3767bfeaa472
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-02 07:29:23 +00:00
Marco Benelli
a212b1f745 Fixed wrong behavior of "Move Component in Separate File" for qml.
The dialog accepted/rejected value is now checked.

Task-number: QTCREATORBUG-14175
Change-Id: I9a39c0cf87b7e11613a333b2d3a63b77e39b6d97
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-02 07:10:09 +00:00
Eike Ziller
9b49152fec FileSearch: Remove duplicated code between regexp and non-regexp search
Only the way individual files are searched is different, so the rest of
the code is now shared.

Change-Id: Ia550de1b5d381c5f7c26c3f3e7a943fea7d0efa9
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-02 06:46:05 +00:00
Christian Kandeler
7aa8ae54ae Device support: Serialize SSH options.
We forgot to do the serialization when the options member was added to
the SshConnectionParameters class.

Task-number: QTCREATORBUG-14205
Change-Id: Id79a2b585d8e00abd5389ccf40821af342a30c30
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-01 15:02:04 +00:00
Alessandro Portale
fb9cea18a8 Core: Replace usage of QScriptEngine with QJSEngine
This replaces the dependency of Core on QtScript with the dependency on
QtQml.

Changes: QJSEngine manages the onwership of injected QObjects. The
Exception information is part of QJSValue instead of the engine.

Change-Id: I54e40a7f2f7795424c4f3e37d962ac59fc2b1a09
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-01 14:55:07 +00:00
Eike Ziller
0a294eebe4 PluginManager: Add "-load all" and "-noload all" command line options
Task-number: QTCREATORBUG-11826
Change-Id: Ia033c1f8c69bbb2c757a0d8284c56168ad88155c
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-01 14:16:12 +00:00
Eike Ziller
33a5e7d804 PluginManager: Behave more like a package manager
Instead of implicitly disabling plugins if their dependencies are
disabled, implicitly enable plugins if some enabled plugin needs it.
That will avoid issues if people disable plugins (e.g. QmlJSTools et al)
and we later add one of these as a dependency to another plugin (e.g.
make QmakeProjectManager depend on QmlJSTools), which resulted in the
previously enabled plugin being implicitly disabled.

Enabling a plugin in About Plugins now asks for all required
dependencies to be enabled as well.
Disabling a plugin in About Plugins now asks for disabling all plugins
that require it.
Using the -noload command line option now disables all plugins that
require it in addition.
Using the -load command line option now implicitly enables all plugins
that are required.
Multiple -noload and -load options are handled in the order given on the
command line.

Task-number: QTCREATORBUG-9131
Change-Id: I0956106105060a7898a8992e0629009d5ec3ea4d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-01 14:15:58 +00:00
Nikita Baryshnikov
ed9104bad6 TstPluginspec: fix compilation
Change-Id: Ic89b06f60231a4a2bee815dacf6c9fce0818566a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-01 13:03:49 +00:00
Robert Loehning
1d0e61a52c Squish: Work around items not expanding
Task-number: QTCREATORBUG-14210
Change-Id: I64e5b53c5cb82b961ec100d73f0987d79d68f5b4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-01 11:12:29 +00:00
Eike Ziller
d456fd0b8a PluginSpec: Naming and encapsulation improvements
Prefer enabled state as a property as opposed to disabled state, and
make setter correspond to getter. Also move setters into private.

Change-Id: I5d002a12f4e540d5b38cc5865490d056ec75f296
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-01 10:46:18 +00:00
Eike Ziller
fcc6b11230 Merge remote-tracking branch 'origin/3.4'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Iaff42d30008db13ecb685e5157c82292fe48b038
2015-04-01 11:53:26 +02:00
Orgad Shaneh
0501efdcd9 CppTools: Add a failing test for explicit template base typedef
Task-number: QTCREATORBUG-14218
Change-Id: I1cccc522f0d484e966f97bea86236e83caec754a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-01 09:45:24 +00:00
Orgad Shaneh
55ed8b861b CppTools: Add 2 failing tests for double pointer indirection
... when resolving specialization

Change-Id: Id3b673fa0c85b13f9a3b4bda022ef2ff18d4c2ac
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-01 09:42:42 +00:00
Eike Ziller
57794c170e Close with error if Core plugin is found but disabled
Change-Id: I9ec0f970da99ce7cdf171684b41fafa4b38a2629
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-01 09:34:59 +00:00
hjk
c12593efc4 Debugger: Show unsigned chars as unsigned values
Task-number: QTCREATORBUG-13809
Change-Id: I5dbb85c44cdc801edee1f33bc0c0cf47ec9916a3
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-01 09:30:56 +00:00
Nikolai Kosjar
d4abde4cba Clang: Offer snippets only for global completion
Task-number: QTCREATORBUG-14181
Change-Id: Ib9eee53f5398cb13643871d862876f329a2fd9ae
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-01 09:26:12 +00:00
Eike Ziller
841046aeda Version bump
Change-Id: Ie12f7ab510b6d9857772df9f36c99e72b8766520
2015-04-01 11:24:41 +02:00