feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
19,311 Commits 108 Branches 368 Tags
ac9a3bc924329822e4fb9b917a4b46a1a9e94b8c
Commit Graph

19311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Friedemann Kleint
ac9a3bc924 tr()-fixes for 2.3. 
Change-Id: I38345500156ce6fa4eb747562a3f9434040615ff
Reviewed-on: http://codereview.qt.nokia.com/473
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-14 12:24:40 +02:00
Christian Kandeler
140eaaab0b RemoteLinux: Make device configurations settings page generic. 
The list of per-device actions now comes from a factory and can
be different for different OS types.
This is a step towards moving knowledge about devices from the
RemoteLinux plugin into specialized plugins.

Change-Id: Ia46e0199d8d8c1a3891c73a4936ac53fb1063313
Reviewed-on: http://codereview.qt.nokia.com/439
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-14 12:12:00 +02:00
dt_
2b31dbadcf Add a disabled reason to the display of runconfigurations 
Also distinguish between qt runconfigurations that are disabled
due to parsing and due to not being parseable

Change-Id: Ia8ce4eaa7b6bfcc2c5290b254bb288c6d4892170
Task-Nr: QTCREATORBUG-5103
Reviewed-on: http://codereview.qt.nokia.com/451
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-14 11:58:39 +02:00
Kai Koehne
9196921429 QmlProfiler: Add qt4projectmanager dependency also in plugins.pro 
Make sure qt4projectmanager is built before qmlprofiler gets linked.

Change-Id: I34efcdd431c18b5941e0748213fec0b8e80d1600
Reviewed-on: http://codereview.qt.nokia.com/469
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-06-14 11:32:29 +02:00
Thomas Hartmann
971310dae3 QmlDesigner.plugins: getters should be const 
metaInfo() and pluginName are now const.

Change-Id: I41ad0ad11d19268e18e839adcdbd8fb6bfba629d
Reviewed-on: http://codereview.qt.nokia.com/470
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-14 11:08:44 +02:00
Tobias Hunger
76448eec06 Manhattanstyle: Fix IndicatorToolBarHandle 
operator + binds stronger than ?, so the evaluation of the expressions was
screwed up.

Change-Id: Id38adf6e17ea770d1d3219649629b06bfc2ca643
Reviewed-on: http://codereview.qt.nokia.com/348
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-14 11:02:24 +02:00
Kai Koehne
73b66f5d08 Analyzer: Use Utils::OutputFormat everywhere 
Replace hard distinction between 'out', 'err' with flexible
OutputFormat. Also make sure that QmlProfiler shows application output.

Change-Id: I130c71884321e4c59c9a75f0836c37a7f0e805c4
Reviewed-on: http://codereview.qt.nokia.com/458
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
 2011-06-14 10:14:19 +02:00
cerf
83566c3c3a vcsbase: simplify init of the diff editor in VCSBaseClient 
Bazaar and Mercurial plugins are impacted, they benefit auto load/save
of the diff settings

Change-Id: I67327b231fd80eeb61bb859879f9eabdc56739e8
Merge-request: 345
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/463
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-06-10 17:47:20 +02:00
cerf
21c048363e Bazaar: save settings on plugin destruction 
Change-Id: I94d5c1f1944b51a284e41ad9be0168f3edc99292
Merge-request: 345
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/462
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-06-10 17:47:09 +02:00
Kai Koehne
0ff094305f S60RunControl: Fix gcc warning 
Change-Id: I5cb1adbdbb5dbd457e5609997eeb9fae74813141
Reviewed-on: http://codereview.qt.nokia.com/461
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-10 17:29:35 +02:00
Christiaan Janssen
bc04a3b385 QmlProfiler: set clip in timelineview 
Otherwise the user can mouseover events that are not displayed.

Change-Id: I8108cfbf730708bbad4a6d2cc812ee1b3a1a444a
Reviewed-on: http://codereview.qt.nokia.com/457
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-10 17:13:37 +02:00
Christiaan Janssen
020b86a8c9 QmlProfiler: start timeline at 0 
Change-Id: Id42f2dd156863c8cfa19ce27f03b862c512b6b57
Reviewed-on: http://codereview.qt.nokia.com/456
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-10 17:13:12 +02:00
Christiaan Janssen
601f29b414 QmlProfiler: skip computing fps when not going to display them 
Change-Id: I808f8a3b1cb6243f7df40bb1747d9ca92fb80380
Reviewed-on: http://codereview.qt.nokia.com/455
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-10 17:12:36 +02:00
dt_
15e950d451 Fix makefile location check for qmakestep 
Change-Id: Idf1842be4f8d7fe62b1569845b3f70ad1da32abd
Task-Nr: QTCREATORBUG-5127
Reviewed-on: http://codereview.qt.nokia.com/459
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-10 16:51:44 +02:00
dt_
d3cf2c598e Keep the old name on editing qt versions 
Change-Id: I80782e8256360f944a09f77de5da30884adccffa
Task-Nr: QTCREATORBUG-5126
Reviewed-on: http://codereview.qt.nokia.com/454
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-10 16:48:16 +02:00
dt_
186f411593 On editing qmake, start in a sane directory 
Change-Id: I3d10946c50482bc8ec0e166bf6ea92bde2822f63
Task-Nr: QTCREATORBUG-5125
Reviewed-on: http://codereview.qt.nokia.com/453
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-10 16:48:09 +02:00
Pawel Polanski
3f750695b4 Symbian: TRK is no more! 
TKR-related code has been removed.
From now on CODA is the default On-Device
Agent

Change-Id: I52236a33aff9b31ca48d507da97430df7d871239
Reviewed-on: http://codereview.qt.nokia.com/450
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-10 16:45:38 +02:00
cerf
eed4d1e149 vcsbase: make settings mutable inside VCSBaseClient 
VCSBaseClient takes now a pointer to VCSBaseClientSettings, so settings
can be changed within the VCS client. For example diff settings can now
be loaded and saved from within the VCS client.
This impacts the Bazaar and Mercurial plugins

Change-Id: I84882b1f3355e0ca2597704f48f589dca42fd661
Merge-request: 344
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-06-10 16:03:51 +02:00
Kai Koehne
2f97c709de QmlProfiler: Support profiling via CODA on Symbian 
Change-Id: I44be1a67c95814a78c82b17e991e5e3a722a63c8
Reviewed-by: Christiaan Janssen
Reviewed-on: http://codereview.qt.nokia.com/428
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-10 14:37:36 +02:00
Kai Koehne
1f184bf2ad QmlProfiler: Track status of app through application output 
We do that already in the debugger too.

Change-Id: I31828a01aaec041ac38102b9bd034728d02486e2
Reviewed-on: http://codereview.qt.nokia.com/427
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-10 14:34:36 +02:00
Kai Koehne
6aa615db52 Export S60DeployConfiguration class 
Allow the class to be used in QmlProfiler

Change-Id: I11e5bad9a836a0589f1cded431844c9cd8185e22
Reviewed-on: http://codereview.qt.nokia.com/426
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-10 14:34:01 +02:00
Kai Koehne
e1448381bc Export S60DeviceRunConfiguration class 
Allow class to be used in QmlProfiler. The patch moves
S60DeviceDebugRunControl(Factory) classes into their own files. Also,
make qt4Target(), qtVersion() protected and use the generic target()
method instead outside of the class.

Change-Id: I29e7609cf75d54e186fe2b9d66f52241f4fb4948
Reviewed-on: http://codereview.qt.nokia.com/425
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-10 14:33:52 +02:00
Kai Koehne
527aa1d66c Export CodaRunControl class 
Allow class to be used in qmlprofiler plugin.

Change-Id: I2bf055c287254ba4d541879d8c8ebc27fdd8887b
Reviewed-on: http://codereview.qt.nokia.com/424
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-10 14:33:38 +02:00
cerf
85cc1afe54 vcsbase: auto load/save settings in EditorParameterWidget 
Change-Id: If99006d418d8e3878677518a1bc0997bdfef38c6
Merge-request: 341
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/444
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-06-10 10:46:12 +02:00
Tobias Hunger
f82c4ea3c6 Tasks: Only report warning tasks in build progress 
Task-number: QTCREATORBUG-5020
Change-Id: Iead3d76509dd7b6d6c04d0ef64b7b3d2cad316d0
Reviewed-on: http://codereview.qt.nokia.com/369
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-10 10:43:48 +02:00
Tobias Hunger
9f9d7bb12b Codepaster: Fix warning about hidden virtuals 
Change-Id: Id4838e20b4a62d31bf3d739836011e9bcfa2e335
Reviewed-on: http://codereview.qt.nokia.com/353
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-10 10:43:37 +02:00
Friedemann Kleint
2da6f8d479 Wizards: Do not allow ~,! in file names. 
Task-number: QTCREATORBUG-5063

Change-Id: Ide80c5e52a867c45d8feb9109c65328bdda0f86c
Reviewed-on: http://codereview.qt.nokia.com/443
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-10 09:37:46 +02:00
dt_
39b7faa110 Fix first rename after creating a new project 
Change-Id: Iec997ba24a11a5035d3f70ce5818d44142f3c5a6
Task-Nr: QTCREATORBUG-5116
Reviewed-on: http://codereview.qt.nokia.com/440
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-09 17:45:28 +02:00
Thomas Hartmann
fa48cf8a20 QmlDesigner.nodeInstanceView: adding parameter pathToQt 
The NodeInstanceView is now informed about the build pathToQt.

Change-Id: I728c9c356354ccf73599950c1c0bf4a96bd0a628
Reviewed-on: http://codereview.qt.nokia.com/437
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-09 17:34:18 +02:00
Thomas Hartmann
cae968027a QmlDesigner.documentController: keep track of the current Qt Version 
Keeping track of the Qt Version and its binary path

Change-Id: I885880dd6ad45ea1fab7785cb043da1abd5aded3
Reviewed-on: http://codereview.qt.nokia.com/418
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 17:29:39 +02:00
Thomas Hartmann
85628119f2 QmlDesigner.formEditor: crash fix 
I had a crash here, because the qmlItemNode was invalid.

Change-Id: Ib6d8bbde7acf7e5f6a0fb56bf496c41df29f7142
Reviewed-on: http://codereview.qt.nokia.com/438
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-09 17:23:00 +02:00
Thomas Hartmann
58504e2182 QmlDesigner.nodeInstances: on windows executables end with exe 
On Windows executables have the suffix ".exe"
I also enclosed the strings with QLatin1String

Change-Id: Idf7a16ca6e0370f091225aaea7137418d8563aaf
Reviewed-on: http://codereview.qt.nokia.com/436
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-09 17:22:26 +02:00
dt_
414d128627 Renaming files: fix case-change only renames 
Change-Id: Ie95133d22de33a0acca7756b8a41b3812e7dd9e7
Task-Nr: QTCREATORBUG-2434
Reviewed-on: http://codereview.qt.nokia.com/435
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2011-06-09 16:49:11 +02:00
Christiaan Janssen
e463874ca6 QmlProfiler: disabled FPS display (for now) 
Change-Id: Ib35d3833e7d360b924ecaaaf46ae5c65f3bd7b8e
Reviewed-by: Kai Koehne
Reviewed-on: http://codereview.qt.nokia.com/434
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 16:34:59 +02:00
Marco Bubke
d103bb7a60 QmlDesigner.NodeInstances: Support for Qt five scene graph 
QmlPuppet only supported GraphicsView. There is now Qml2Puppet which is
supporting the new Qt Scene Graph.

Change-Id: Ia0a06639cf6852192e84f7bfc2bea60532890b08
Reviewed-on: http://codereview.qt.nokia.com/433
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-09 16:07:28 +02:00
Christiaan Janssen
74f1c2e277 QmlProfiler: removed scrollbar, timeline stretches automatically 
Change-Id: Ibc012d517556914e61ccbf58245a6d83cb4c8a80
Reviewed-by: Kai Koehne
Reviewed-on: http://codereview.qt.nokia.com/429
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 15:35:09 +02:00
Christiaan Janssen
5e786fd128 QmlProfiler: renamed "Summary" tab to "Bindings" 
Change-Id: Ib6341937847cc784078f499dd0040456bd60efee
Reviewed-by: Kai Koehne
Reviewed-on: http://codereview.qt.nokia.com/430
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 15:15:43 +02:00
Orgad Shaneh
4be9299f89 * External Tools: Added shortcut for menu entry 
Merge-request: 342
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Ib765053e69f3917356ad30d70306165cfa19effa
 2011-06-09 14:41:58 +02:00
Christiaan Janssen
ccd9354c29 QmlProfiler: renamed from "Perfomance Monitor" to "Profiler" 
Change-Id: I00e051f810fb147775c925f0e2378a46d660967e
Reviewed-on: http://codereview.qt.nokia.com/423
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-09 14:35:22 +02:00
dt_
57d1598d2c ProgressView: Also replace old tasks that are canceling 
Those tasks might not have finished yet, so there's a small race when
canceling and restarting a task.

Change-Id: I9f9ffcc6869455e7d8a407ff6ff4c40518d60f27
Task-Nr: QTCREATORBUG-4801
Reviewed-on: http://codereview.qt.nokia.com/419
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-09 14:25:38 +02:00
Thomas Hartmann
f38b0e7bd8 QmlDesigner.componentView: cleaning up 
There was some dead code I removed.
I also refactored the node removal and made it more robust.

Change-Id: I3bd566011302968c1d798689fcca3b4a3880b306
Reviewed-on: http://codereview.qt.nokia.com/417
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-09 11:35:36 +02:00
Thomas Hartmann
0793a8dfb8 QmlDesigner.componentView: update and bug fixing 
I implemented nodeReparented() (bugfix)
I use ModelNode::ComponentSource instead of childNode.type() == "QtQuick.Component"
to catch "implicit" components.

Change-Id: Ie5bd48afbb5a5b10c3544406b1229aafc5dabed5
Reviewed-on: http://codereview.qt.nokia.com/416
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-09 10:54:31 +02:00
Erik Verbruggen
f37e589e94 Added constant values for enumerators in their tooltips. 
Change-Id: I75c5dc43832d42588302bc0dadefcd4b6e2addc6
Reviewed-on: http://codereview.qt.nokia.com/414
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-06-09 09:35:19 +02:00
Thomas Hartmann
b9742018ee QmlDesigner.nodeinstances: adding missing files 
Change-Id: Ied53326c2f8c92b9af28591496e118eef69790b8
Reviewed-on: http://codereview.qt.nokia.com/410
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-08 18:41:59 +02:00
Thomas Hartmann
76355f7c52 QmlDesigner.navigatorView: turn NavigatorView into a QmlModelView 
This will help in the future to add features like a context menu.

Change-Id: I194e79328b72798a8e000a8ca3abe48150965afb
Reviewed-on: http://codereview.qt.nokia.com/409
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-08 18:41:45 +02:00
Christian Kandeler
033837dca6 Maemo: Remove MaemoToolChain::sysroot() method. 
Functionality is already in MaemoQtVersion.
Also move some environment stuff there.

Change-Id: Ibbe91aed5611b1fa60afd3954767596af74b8c80
Reviewed-on: http://codereview.qt.nokia.com/387
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-06-08 17:57:31 +02:00
Thomas Hartmann
7939c270bd QmlDesigner.model: refactoring for nodeSource 
I changed customParserSource into nodeSource and use it also for
components. This means we do not use auxiliaryData anymore with some magic
__component_data identifier.
To distinguish between CustumParserSource and ComponentSource I introduced
the enum NodeSourceType.
Also in this patch I added auxiliaryData in the creation of a node. This was useful
for prototyping and will help with prototyping/testing in the future.

Change-Id: I2152c26c0c767f869f7dce7209abf43f594fd2ad
Reviewed-on: http://codereview.qt.nokia.com/399
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-06-08 17:53:11 +02:00
Tobias Hunger
3d784b84eb S60: Remove some dead code 
Change-Id: Ia7da72fa2a01cd3b563fcae0d7b4d1c99acc46eb
Reviewed-on: http://codereview.qt.nokia.com/384
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
 2011-06-08 17:51:15 +02:00
Tobias Hunger
eaf0c6c745 QmlDesigner: Fix warnings 
Change-Id: I21d103153dd0cebaf69ae57cbf19cfabd3ec3ead
Reviewed-on: http://codereview.qt.nokia.com/385
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-08 17:40:25 +02:00
Thomas Hartmann
bfc68f150a QmlDesigner.documentController: fix text design synchronisation 
The synchronisation of selection between text and designmode was broken.
This fixes a regression.

Change-Id: I4d3fd2f9716398a16e01ce3d389d099bfad1f66b
Reviewed-on: http://codereview.qt.nokia.com/401
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-08 17:26:08 +02:00