feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
30,712 Commits 108 Branches 368 Tags
c03c41a48d034da1b50bff51ee665d65b7d5f39c
Commit Graph

30712 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Kandeler
c03c41a48d Qnx: Fix build with namespaced Qt. 
Change-Id: I022345594a3747a81b2301ce05609f200e9bb2f6
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-25 10:56:02 +02:00
Mehdi Fekari
7b313e9696 Qnx: Refactor BlackBerryConfiguration 
Improve the NDK setting page to enable managing multiple NDKs.

* Refactor BlackBerryConfiguration to support multiple configurations
* Add auto detected kits for installed NDKs
* Add/Remove manual NDKs

Change-Id: Icbc850551da3f729ccaa3473da720ade3051adaf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
 2013-07-24 18:20:23 +02:00
Petar Perisin
2ac65aaa7c Git - Add Cherry Pick in branches dialog 
Change-Id: Ic01846e3f8622cfa7b6c6ada8b626af6fa8cb3e9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-24 17:28:58 +02:00
Marco Bubke
8671bd182c QmlDesigner: Remove empty notifier from QmlModelView 
QmlModelView is abstract and should not hide other notifier.

Change-Id: Ic992829e8e62ecf6142f84251dc1a86d35e35c2d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 17:26:07 +02:00
Marco Bubke
ff9e7a00c7 QmlDesigner: Remove qml function in the QmlModelView 
Change-Id: I94748c9fad017038d61ff5a231a8e5f081985cc0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 17:26:00 +02:00
Marco Bubke
6c848f1bc7 QmlDesigner: Derive DesignerActionManagerView from AbstractView 
Change-Id: Ia0139b51d603fc0f41a3f58f557eab3a77817f98
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:26:38 +02:00
Marco Bubke
6fdd0e27c9 QmlDesigner: Remove empty line 
Change-Id: Id299630f696f02cf82d10f2dafdcdf8cbf6ac8d6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:26:33 +02:00
Marco Bubke
e5b9ff2eed QmlDesigner: Use AbstractView instead of QmlModelView 
Change-Id: I12ad584f8cdc8decb3fd4489a8b8ec820ff2be91
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:26:28 +02:00
Marco Bubke
ff96f520e1 QmlDesigner: Refactor creation of nodes in the qmlmodelview 
Change-Id: Iad331275421a9ff4a693d6f04bb2da793304a48d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:26:23 +02:00
Marco Bubke
d5ce90af49 QmlDesigner: Ask the view instead of cache values 
Change-Id: I58b53af49f8f5570111c5cdb8a880e683c4ec51d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:26:18 +02:00
Marco Bubke
786bd92117 QmlDesigner: Use the selection instead of the passing a node to the custom tool 
Change-Id: I69d6d3cf9d35378ef80e9d232123cb5f4b1fa8cb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:26:11 +02:00
Marco Bubke
9a0abef12a QmlDesigner: Add more selection methodes in the AbstractView 
Change-Id: I91afb480d65908e962e912b241d07a4f66e67a3a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:26:05 +02:00
Marco Bubke
d54be468ca QmlDesigner: Make AbstractView parameter const 
Otherwise we can not past a const AbstractView in a const method.

Change-Id: I59dab8b6c5cfb3a3b56bd13f61d237a8a94df3b0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:25:59 +02:00
Marco Bubke
599b72a24a QmlDesigner: Use is valid functons instead of create a invalid node 
Change-Id: I5f7cdcede593cdce2c577315ccead95e8841870e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:25:52 +02:00
Marco Bubke
07147a3283 QmlDesigner: Ask if the id exists instead of get the node and test it 
Change-Id: I3604981fdeda7c3da67523d5d01b513b09037c7f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:25:45 +02:00
Marco Bubke
b8fb4a135f QmlDesigner: Add isValidQmlModelStateOperation 
Change-Id: I10f4a9dbb2ba8ad25553b6cae10e78162514d85b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:25:40 +02:00
Marco Bubke
9a8f5383d5 QmlDesigner: Improve short name 
Change-Id: I773964fac0b4981a9d33bc047b8e5e9599c2a3b0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 16:25:33 +02:00
Tobias Hunger
f2e73c789e Add include 
Change-Id: I160273e0029e90f692fcedb0227ccf67c9efbea3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-24 15:54:01 +02:00
Marco Bubke
ecc8bfd07d QmlDesigner: Add isValidQmlPropertyChanges 
Change-Id: Ib859c10fc17148822e18c2d4e03c229ae6f8230d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 15:44:00 +02:00
Marco Bubke
cc75d77c80 QmlDesigner: Add static valid functions for the qml objects 
Change-Id: Ied3ec55580471893c8899946455ce2b5198c6f17
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 14:49:03 +02:00
Marco Bubke
56de157497 QmlDesigner: Refactor inline functions in QmlModelNodeFacade 
Change-Id: I7408b6ad2a767eb944436c5cc62c87609aba8a69
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 14:48:57 +02:00
Marco Bubke
3a0af1ce5f QmlDesigner: Refactor inline functions in QmlObjectNode 
Change-Id: Ibc80c36efffb539417817c84f8c0cd19ccd1770d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 14:19:51 +02:00
Marco Bubke
44bbfa3bc4 QmlDesigner: Better argument checking for the qml2puppet 
Change-Id: Ib4c83d9bb30705c23b9966696ebc7015501da154
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2013-07-24 14:19:42 +02:00
BogDan Vatra
8da960b386 Cleanup qbs project manager .h files. 
Forward QBS releted classes.

Change-Id: I69ebb8e5aca9c8534392deb5ce805d6c711f9c4e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-24 13:38:47 +02:00
Tobias Hunger
c9cafea3c4 Symbian: Remove references to RVCT compiler used on Symbian 
Change-Id: I0ebfb74f65ffaf9ea47cc91fa20dd73af62218e5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-23 17:03:45 +02:00
Tobias Hunger
78d6e603ed WS fix 
Change-Id: I5022ca4372184c324f0284c417270dfa126385d0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-23 17:03:15 +02:00
Tobias Hunger
72257d7eda Qbs: Fix build 
Change-Id: Ic4ae5421183f2caec79f59bbab0bf1cf32780f04
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-23 10:45:22 +02:00
Orgad Shaneh
39755c09b9 Git: Only show Tags root node when tags are enabled and exist 
Create it on demand. Remove on clear

Change-Id: Ic29e82a859f99b5d739c25be83aa6c40a1ee2cc8
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-22 12:38:54 +02:00
El Mehdi Fekari
8f05239b92 Make Kit::makeSticky method public 
This method is needed by plugins (ex. qnx) that provides
auto detected kits to prevent kit's information
from any unwanted changes.

Change-Id: I6f0b36983436890aef62f5204d0f8a51d5e645fb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-22 12:13:35 +02:00
Orgad Shaneh
ea424a076c Git: Use enums instead of numbers for branch root nodes 
Change-Id: I52e9fce33c2a157389a88377e2f24695e8c3722d
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
 2013-07-22 08:08:45 +02:00
Petar Perisin
e6de18eaab Git - show command name in tooltip 
Change-Id: Ib652813c713e24cf9cbe8cb4b77207d54be7e132
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-21 23:03:00 +02:00
Eike Ziller
e1f6718c35 Use actual editor instance from activateEditor to jump to line 
Change-Id: I679d9809dd0f7c945ff2ebde53330a922834795f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-19 17:21:48 +02:00
Eike Ziller
e3b2c2a935 Remove remaining usage of EditorManager::openedEditors 
Change-Id: I0cc073b8e5421f6c2f0bc460ea8dedc205b2a22f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-19 16:53:57 +02:00
Robert Loehning
3897137b0a Squish: Updated tst_create_proj_wizard 
Change-Id: I04bfd317ce85f764f97d341b46b20264976ef9bd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-19 16:02:15 +02:00
Orgad Shaneh
531cba5812 LdParser: Do not interpret .data as a source filename 
Change-Id: Ide088490db3c48f5036cc2969d4841e08d9a15cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 15:06:12 +02:00
Orgad Shaneh
f262593596 GccParser: Consider multiple definition an error 
Change-Id: I0048944f5fda066bc97552a81b57d24f8a14f55d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 15:06:08 +02:00
Erik Verbruggen
23085895d6 C++: handle @try statements in the parser. 
No semantic analysis yet, but this prevents the parser from generating
bogus diagnostics.

Task-number: QTCREATORBUG-9309
Change-Id: I2ec575a8474cd51bfa97b17678d3da71ab8dcd7a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-07-19 14:49:38 +02:00
Nikita Baryshnikov
61367fc6ab Git: fix crash in branches dialog 
When tags are not shown in branches dialog, selecting of any item in
branches list causes crash

Change-Id: I8bfb66202f486c175a14c59f17b43df21ff596ff
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-19 14:21:13 +02:00
Eike Ziller
745f82bfc6 Merge remote-tracking branch 'origin/2.8' into HEAD 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I59ce346c85803f5496a22bdadf7dca09e59d3174
 2013-07-19 14:17:43 +02:00
Eike Ziller
56bdad140c Fix crash with splitting and non-splittable editors 
We may not just add an editor to a view without removing it from the
original view.

Task-number: QTCREATORBUG-9843
Change-Id: I1041ceb1f063bb627b5f0bd16bc3b2973a4dc3b6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-19 14:14:56 +02:00
Orgad Shaneh
360366ae08 VCS: Remove unused termination mode 
Defaults to NoReport and nobody sets other values

Change-Id: I3def23bd350fcef45df9eb8d3a0e86baac192bd9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 13:56:41 +02:00
Orgad Shaneh
0c50c5a1d3 VCS: Consolidate codec handling 
Change-Id: I2c9a5031b63f0bc3e884739be680d051d7cf1ab4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 13:56:34 +02:00
Christian Kandeler
a1e9b81cec Device support: Rename DeviceManager::deviceListChanged(). 
The name is misleading: A "change" could also mean a device was added or
removed, which is not what his signal tracks. The new name is
"deviceListReplaced", which should give a better hint.
In addition, add an explanatory comment.

Change-Id: I0a67c4caf20520df53f2d046905b7ac8da4c2972
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 13:53:51 +02:00
Orgad Shaneh
794ea51447 LdParser: Do not consider "first defined here" as an error 
Change-Id: I01b27cd12776e22a5b52ceae4c89a4cd567c69ed
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 13:03:35 +02:00
Orgad Shaneh
9744c54580 Add soft assertions for regexp patterns 
Change-Id: If0072f8f9761bdc34b35d01aac4d00c5391b8a20
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 13:01:20 +02:00
Orgad Shaneh
a27b0907ee LdParser: Fix position regexp 
Position is always followed by colon, not only for .text/.data

Change-Id: I7790c5704423aa57f9752fce1021f67319c58df8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-19 12:59:35 +02:00
Nikita Baryshnikov
56d3be8c0b DiffEditor: fix crash on diff action 
Fix crash in GitClient::findExistingOrOpenNewDiffEditor as new DiffEditor
is not created

Change-Id: I7f0cd18ff3acffe1d83a5fad4d6f0df8c4d133f3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2013-07-19 12:14:34 +02:00
Aurindam Jana
885520d954 RemoteLinuxAnalyzeSupport: Fix empty remote command line to device 
Currently only QML profiling is supported. Pass the remote command
along with -qmljsdebugger argument to device.

Change-Id: Ia64396f9c6da80e70cb1ee624ed974f8cc32465f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2013-07-19 10:57:06 +02:00
Petar Perisin
a766fc42bb Git - allow stash-only in stashPrompt 
Change-Id: I5e81bd3dfc8986c7492701ac5ce5537e0d591834
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2013-07-19 10:33:58 +02:00
Orgad Shaneh
b6fb9e3e54 VCS: Support silent output on runVcs 
Change-Id: If737b03f9d090076e9d739189479fb6725ae8856
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-07-18 17:16:30 +02:00