feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,107 Commits 108 Branches 368 Tags
1c52bed5d00c558569d03e65de1c6a31f3ccd3cc
Commit Graph

21107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Friedemann Kleint
d411933fe6 Documentation: Clarify global variables. 
Rubber-stamped-by: hjk

Change-Id: Ic5d8a50deeee93572d838725d1cf4d2af6245c0f
Reviewed-on: http://codereview.qt.nokia.com/510
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-20 14:15:47 +02:00
Friedemann Kleint
e4651a28e3 External editors: Fall back to path if not found in Qt version. 
Use Designer/Linguist executables from path if (embedded)
Qt version does not ship them.

Task-number: QTCREATORBUG-4826
Change-Id: Ide2fe0e59a8ea8f93a9193e0f97877631ce68470
Reviewed-on: http://codereview.qt.nokia.com/502
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-20 12:43:15 +02:00
hjk
8e66c35f01 debugger: add test manual case for displayin dynamic type 
Change-Id: I1120182c18a2ded59bfd46a6082eaef8cbd723ee
Reviewed-on: http://codereview.qt.nokia.com/504
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-20 12:42:14 +02:00
hjk
af17b8a8ca Add model tester to Creator sources. 
Change-Id: Idf7519b1bcaf8c83d00a4d78674049a79bf0aa6d
Reviewed-on: http://codereview.qt.nokia.com/503
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-20 12:42:01 +02:00
con
49ea170692 Add menu item to clear the recent projects/files menus. 
Task-number: QTCREATORBUG-5136

Change-Id: I27d5c86832277be9525d95fd1e38a3b86f620974
Reviewed-on: http://codereview.qt.nokia.com/496
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-20 12:41:10 +02:00
Pawel Polanski
78f98c1741 Symbian: Remove TRK releated stuff from tests 
Change-Id: Ie5142d4ee21470bceeeb3f27bc9f4646d6ac0af7
Reviewed-on: http://codereview.qt.nokia.com/501
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-06-20 12:00:50 +02:00
hjk
5034542402 debugger: add test case for #5106 
Change-Id: Ia6c765671f14298400dedaa7797e09cf6cd1e6b1
(cherry picked from commit 67187b215218b7a0ade5ae0da898f7edb71ee3b4)
Reviewed-on: http://codereview.qt.nokia.com/499
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-20 11:34:34 +02:00
hjk
d647a6002e debugger: display "sub-breakpoints" 
<MULTIPLE> happens in constructors, inline functions, and
at other places like 'foreach' lines.

Change-Id: Ifb89b659d279f257ba8295b80a35d605820ec54b
Reviewed-on: http://codereview.qt.nokia.com/498
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-20 11:34:22 +02:00
hjk
cc43a59763 debugger: make QModelIndex and QAbstractItemModel dumper work on core files 
Change-Id: I299334f2b552d4b051dfd9d0d4d85a54b92d0c2d
Reviewed-on: http://codereview.qt.nokia.com/497
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-20 11:34:10 +02:00
con
8ce43b6c28 Make qmake browse button follow the naming convention. 
Change-Id: I599f81a9e320f970b6f44df566d599508dfa0a7f
Reviewed-on: http://codereview.qt.nokia.com/488
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-20 11:23:43 +02:00
con
5147aa02c4 Make it possible to select Qt version on Mac OS. 
Need to work around QTBUG-7739 that prohibits filters that don't start
with *

Change-Id: Ia984b25903abab125b403b53b5f3fe70ac9c54d4
Reviewed-on: http://codereview.qt.nokia.com/482
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-20 11:20:14 +02:00
Friedemann Kleint
7c11374f90 L10n: German translation for 2.3. 
Change-Id: I33889fba7a9b7dfcf4fb84188fc0526230005e12
Reviewed-on: http://codereview.qt.nokia.com/494
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-20 10:49:15 +02:00
Friedemann Kleint
8a841546b9 tr()-Fixes for 2.3: Small spelling/notr-fixes. 
QML Profiler,etc.

Change-Id: Ie4c5b6152735b45257856340797b446c3360edd5
Reviewed-on: http://codereview.qt.nokia.com/493
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-20 10:48:36 +02:00
Christiaan Janssen
1cb206a4c4 QmlProfiler: changed display name to QML Profiler 
Change-Id: Ieb9cf689d72986b3ede931f327b048d25a53cf6e
Reviewed-on: http://codereview.qt.nokia.com/490
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-20 10:46:43 +02:00
Thomas Hartmann
c3c8463122 QmlDesigner.rewriterView: setupImports even if semantic checks fail 
Change-Id: Idb243372f4c639c91ea3085c3fdf916758ddcf49
Reviewed-on: http://codereview.qt.nokia.com/485
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-15 17:27:20 +02:00
Thomas Hartmann
8452f28bf7 QmlDesigner.nodeInstances: fix regression 
Images are visible again.

Change-Id: I02c2a2e741accda4d3f67cbb2a1cf5a12cabafb1
Reviewed-on: http://codereview.qt.nokia.com/484
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-06-15 17:27:03 +02:00
Friedemann Kleint
0ef59d9970 tr()-Fixes for 2.3: Small spelling/notr-fixes. 
Change-Id: I66b8b0e20b225429b4399dfca154a2806260ac61
Reviewed-on: http://codereview.qt.nokia.com/483
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-15 17:25:36 +02:00
Christian Kamm
74d015d2a9 Update QtMobility QML type descriptions to 1.2.0. 
Change-Id: I31b0f9cc55763d22dbf6ff75252c6e10e5a1b0f2
Reviewed-on: http://codereview.qt.nokia.com/481
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-06-15 14:47:15 +02:00
Christian Kandeler
a6c63854e4 Maemo: Fix check toolchain check for valid Qt version. 
Change-Id: Icf34111ad63cd4e76c5eb8bd18111e7317f07c9c
Reviewed-on: http://codereview.qt.nokia.com/479
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-06-15 14:22:13 +02:00
Friedemann Kleint
a56162ec6e tr()-Fixes for 2.3: No contractions, spelling. 
Change-Id: I08babdb15bcf7f7ac086e9e12955b780b7591391
Reviewed-on: http://codereview.qt.nokia.com/480
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-14 17:18:48 +02:00
Orgad Shaneh
c8ca023b58 Close write channel of external processes 
Prevents external process from waiting for user input.

Merge-request: 347
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Icfd3e39a83ba945ebf89c1cbb2157e2a1c9f4d89
 2011-06-14 16:47:51 +02:00
Christiaan Janssen
441966fad3 QmlProfiler: zooming on the timeline 
Change-Id: I3057c687d9e812448fd2c2846b06ac7c2d32d5e3
Reviewed-on: http://codereview.qt.nokia.com/476
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-06-14 15:40:03 +02:00
Christian Kandeler
245eb743ac Maemo: Remove support for debugging with an on-device gdb. 
It was only a workaround for a Fremantle problem that no longer
exists and has no advantages to the gdbserver approach.

Change-Id: Ia92c3e423fde3735a010d8abff646593f8bccdda
Reviewed-on: http://codereview.qt.nokia.com/478
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-06-14 15:07:24 +02:00
dt
118de5c2d9 Add a toolchain combo box to the cmake run page 
Selecting the toolchain is a configure time setting for cmake. So
that's the right place, except for us the debugger also depends
on the toolchain. Switching the debugger thus involves reconfiguring.

Also due to the cmake cache in most cases reconfiguring with a different
toolchain selected won't do anything.

Cmake and creator's concept of toolchains clash.

Task-Nr: QTCREATORBUG-4898

Change-Id: Ibf84029d7008046891750a91666d0e3e4711ec69
Reviewed-on: http://codereview.qt.nokia.com/477
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-06-14 15:05:06 +02:00
Kai Koehne
d211ef0e06 QmlDesigner: Add new dependencies to plugins.pro 
Change-Id: I31d1938194574dbc90b4df948b70781679f4830d
Reviewed-on: http://codereview.qt.nokia.com/472
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-06-14 14:46:19 +02:00
Sergey Belyashov
08a28aacad Updated Russian translation 
Merge-request: 346
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Ied278c283575809b54f4bfb4e8fcda9fe38eb56b
 2011-06-14 14:06:05 +02:00
Thomas Hartmann
0beb721fc8 QmlDesigner.nodeInstances: fix for incompatible Qt Version 
If the Qt Version is incomaptible (e. g. mingw) we have to use
the qml file for a component shipped with Creator.

Otherwise a import "." statement will break the component.

Change-Id: I7e354a15205567407533579f92e65f2be73a614ex
Reviewed-on: http://codereview.qt.nokia.com/474
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-14 12:47:07 +02:00
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
hjk
f35c4145a3 version bump to 2.2.1 
Change-Id: Ie9db48ce3524491d4dd8b17fb79e26a1ecd8bd77
Reviewed-on: http://codereview.qt.nokia.com/471
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-14 11:19:07 +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
hjk
b3ef50aeab rename ChoiceList into SelectionListItem 
Reviewed-by: Thomas Hartmann
Change-Id: I4116e63da6633bebb21ba08084e2d8edde4aaaaax
Reviewed-on: http://codereview.qt.nokia.com/468
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-14 10:32:03 +02:00
Thomas Hartmann
a2c1ae8a58 QmlDesigner.itemLibrary: adding plugin for extra components 
A new extra component plugin.
(cherry picked from commit fbcbac5a65)
(cherry picked from commit 0e3f13e921f3812f8944a22375131b4e2fd87f87)

Change-Id: Ifbcbac5a65b26da281404f63885dff884afaba78q
Reviewed-on: http://codereview.qt.nokia.com/467
Reviewed-by: hjk <qthjk@ovi.com>
 2011-06-14 10:31:50 +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