Commit Graph

21107 Commits

Author SHA1 Message Date
hjk
f9f37e689e debugger: cosmetics
Change-Id: I78c9ccfa310833140fda0d6294586cc6beaf9964
Reviewed-on: http://codereview.qt.nokia.com/82
Reviewed-by: hjk
2011-05-24 16:00:43 +02:00
Christian Kamm
312f6d0ff1 C++ style settings: Compile fix for namespaced Qt.
Change-Id: I89db5239576385823315443474669f5fd9ef69b4
Reviewed-on: http://codereview.qt.nokia.com/87
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
2011-05-24 16:00:06 +02:00
Christiaan Janssen
3cf5379380 QmlLivePreview: removing and inserting animations and transitions
Change-Id: Ic776f63f5d7925ac7dfd99be53c10b9af4cb9545
Reviewed-on: http://codereview.qt.nokia.com/75
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-24 13:03:43 +02:00
Christian Kamm
779fafcbfe Make C++ code style configurable.
Change-Id: Iaf08edb2361146e6b5e1cbafdb716a23c938875b
Done-with: Jarek Kobus
Task-number: QTCREATORBUG-2670
Task-number: QTCREATORBUG-4310
Task-number: QTCREATORBUG-2763
Task-number: QTCREATORBUG-3623
Task-number: QTCREATORBUG-567
Reviewed-on: http://codereview.qt.nokia.com/74
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-24 12:45:07 +02:00
dt
f69eb52944 Remove qt 4.3 compability support
Missing proparser

Change-Id: I02c89f3b8d89231f87a010d106d6fc5a58821846
Reviewed-on: http://codereview.qt.nokia.com/62
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2011-05-24 12:17:57 +02:00
cerf
e7b7b5f230 Bazaar: fix incomplete list of files in the diff editor
BazaarEditor::fileNameFromDiffSpecification() was not seeing all lines
starting with "+++ file".
Searching for "=== modified file 'file'" instead solves the problem

Change-Id: Ib1d4c839543f0f8cc00ecbfaa177b369a4c20ee1
Merge-request: 330
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/78
2011-05-24 12:07:53 +02:00
Christian Kamm
d67b7d17dc QmlJS: Refactor ObjectValue members.
* property -> lookupMember
* setProperty -> setMember
* removeProperty -> removeMember

Change-Id: I638479ee2b90b684283e714630bdcab237f6b3f2
Done-with: Fawzi Mohamed
Reviewed-on: http://codereview.qt.nokia.com/77
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-05-24 11:55:03 +02:00
hjk
4bd6bb4d55 debugger: improve robustness of watchers
This solves one common case of adding the 'class' *(class X*)0xdeadbeef
"needed" by gdb in case a local variable at the same location is known.

Change-Id: I5b25530b00e512c6e9155fb111ff4dc916832074
Reviewed-on: http://codereview.qt.nokia.com/76
Reviewed-by: hjk
2011-05-24 11:47:13 +02:00
Christian Kamm
4dcb417c32 Doc: Add notes about QML modules with plugins.
Change-Id: Iabeddf9ddf60c383d2ecdda7ecbb5e930d988684
Reviewed-on: http://codereview.qt.nokia.com/52
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-05-24 08:20:26 +02:00
hjk
46a707fd8d debugger: Fix address output for watchers
There is no address for on-the-fly expressions

Change-Id: Id8c1c2e4d727732196386928a9eddc7c81073415
Reviewed-on: http://codereview.qt.nokia.com/73
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
2011-05-23 17:40:30 +02:00
Leandro Melo
2b2b5aec23 Editor: Removing comments
They are not really necessary. This workaround is used in quite a few
places. Also, the commit message which introduces them
(230445996816eafaa43e40341f382bf63d9d73a8) is already explanatory.

Change-Id: Idb94ab77b47008e7867b9fba21843778aeaaebb7
Reviewed-on: http://codereview.qt.nokia.com/72
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-05-23 16:22:33 +02:00
Christian Hoenig
10dd9c9a8c Workaround to fix cursor movements with invisible cursor
Task-number: QTCREATORBUG-4957
Change-Id: I730550b4d558a2d7fbe34a4052b6cfc5e27fe6e5
Reviewed-on: http://codereview.qt.nokia.com/71
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-05-23 16:16:15 +02:00
hjk
98c412f866 qmlprofiler: remove frame from summary view
Change-Id: I2b56efd0880ee94b1cc4abfb13be83da07e65d19
Reviewed-on: http://codereview.qt.nokia.com/69
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-05-23 15:51:22 +02:00
Christiaan Janssen
246a578a59 QmlProfiler: capitalization of elapsed time display
Change-Id: I327f3527568283876f7b1c2cae2d7cf71940c00d
Reviewed-on: http://codereview.qt.nokia.com/68
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
2011-05-23 15:33:26 +02:00
hjk
10317564f1 analyzer: simplify dockwidget setup
Change-Id: Id450ee1d6ad24707536f9b35e7868e5f8ce9dab2
Reviewed-on: http://codereview.qt.nokia.com/59
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
2011-05-23 14:57:53 +02:00
hjk
251bff8a9c analyze: rework 'addDock'
Change-Id: I3ce22c3f75d5cc631ab22e02f8a52af00452c0c3
Reviewed-on: http://codereview.qt.nokia.com/57
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
2011-05-23 14:57:40 +02:00
hjk
39b71920b3 analyzer: more code shuffling
Change-Id: Ie8bfebf0d47d516ec350dd2d798ee66adad98cd9
Reviewed-on: http://codereview.qt.nokia.com/56
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
2011-05-23 14:57:30 +02:00
hjk
5f1ce56ac6 callgrind: use CallgrindWidgetHandler as CallgrindToolPrivate
Change-Id: I3f425be8df4f9659d4b778b89eed9e031d88bbe8
Reviewed-on: http://codereview.qt.nokia.com/55
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
2011-05-23 14:57:16 +02:00
hjk
f7fee744b9 qmlprofiler: ui and style
Change-Id: I2153ef00f8d3c6d1cc4d39648916cad865b5a9be
Reviewed-on: http://codereview.qt.nokia.com/54
Reviewed-by: hjk
2011-05-23 14:57:03 +02:00
hjk
cc645911c1 qmlprofiler: use dockwidgets instead of tabs in the output pane
Change-Id: I2c33c4309e6568a34517fae2bb37f5e70320cfbe
Reviewed-on: http://codereview.qt.nokia.com/35
Reviewed-by: hjk
2011-05-23 14:56:36 +02:00
hjk
b7d71b0769 debugger: add a manual test for QTCREATORBUG-4019
Change-Id: I813b678a39a11157be522fccf7a05c5b4f879860
Reviewed-on: http://codereview.qt.nokia.com/58
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk
2011-05-23 14:51:58 +02:00
Christian Kandeler
2a7218591c Mobile wizard: Bump version.
Change-Id: I3a757328ba3600ba303ba784efbed42687175db0
Reviewed-on: http://codereview.qt.nokia.com/67
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-05-23 14:44:55 +02:00
hjk
8bb99e4c75 analyzer: merge valgrind based tool plugins
It is hard to imagine there is a real use case that someone wants one but
absolutely not the other.

Change-Id: I58bb57912f2edeacf2d5a24e3b2eb5a81262eabd
Reviewed-on: http://codereview.qt.nokia.com/66
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-05-23 13:55:11 +02:00
Christian Kandeler
84f60e5fda Maemo: Use different desktop files for Fremantle and Harmattan.
So far, we desperately tried not to duplicate the desktop file,
resorting to all kinds of "clever" heuristics in the process.
This is, however, somewhat limiting and confusing to users,
because we do magic stuff behind their backs.
So it seems better to "give up" and use two desktop files.

Change-Id: Idf969eb3ad365f080e5a9c1608149ea6de629d5c
Reviewed-on: http://codereview.qt.nokia.com/31
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-05-23 13:10:56 +02:00
Felix Geyer
ea9b7fb5e5 On unix: install the application icons according to the freedesktop spec.
This allows desktop environments to pick the right icon size when displaying
the Qt Creator menu entry.

Change-Id: I10f6b46fb99202571d081a5e6e4d680be7ca069f
Merge-request: 328
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/64
2011-05-23 12:56:18 +02:00
Leandro Melo
566ae4cc46 Add comment for clarification
Change-Id: I18f35a6682a3fc26bbff51f4371d7e777541792d
Reviewed-on: http://codereview.qt.nokia.com/63
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-23 12:40:57 +02:00
dt
e5a42e2dc0 Remove unecessary include
Change-Id: I25171ca3f2d1e69be289ea6c40f5a063b3244868
Reviewed-on: http://codereview.qt.nokia.com/61
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-23 11:56:56 +02:00
dt
1ce9e72dc1 Move window.png from qt4projectmanager to projectexplorer
Change-Id: Iceb54733dc92c2d674561b803757e1836544aa43
Reviewed-on: http://codereview.qt.nokia.com/60
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-23 11:55:39 +02:00
Leena Miettinen
9f5473e769 Doc: scanning has been removed from Qt Creator.
Change-Id: I439da09a5b0761a95345e54f83f983cb0ddbc01a
Reviewed-on: http://codereview.qt.nokia.com/53
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-05-23 11:30:57 +02:00
Friedemann Kleint
a3c9cb995d Compile fix
Change-Id: I8f3eb7d21074fec00de870d33e493842286222ee
Reviewed-on: http://codereview.qt.nokia.com/51
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-05-23 08:49:03 +02:00
Christian Kamm
f027b1da87 QmlJS: Make the Scanner recognize regular expression literals.
Task-number: QTCREATORBUG-4566
Change-Id: I48b08f8eee79b25d0ebe186b996cdcb8f1979e3d
Reviewed-on: http://codereview.qt.nokia.com/38
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-23 08:30:26 +02:00
Leandro Melo
0350314b22 Completion: Don't propose when there's a "good" candidate
This also generalizes some code previously specific to C++.

Change-Id: I5774d04a45f28a4e276a0ef282ce0aa5a2f2e552
Reviewed-on: http://codereview.qt.nokia.com/48
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-20 17:11:49 +02:00
Leandro Melo
1b374905f9 Completion: Make sure activation sequence has correct length
This is necessary for the very first characters typed on the editor
in the case the activation sequence length is greater than one.

Change-Id: I9ec611f816278795b7ac3f75913fccf5a52165bf
Reviewed-on: http://codereview.qt.nokia.com/47
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-20 17:11:44 +02:00
Leandro Melo
1c60ae1039 Completion: Ignore non identifiers when matching proposals
Since now we reduced the idle editor time for showing completions,
some things started to be a bit annoying. This fix changes the
prefix from the proposal to include only letters, digits, and the
underscore. Yes, technically they are not allways identifiers
in a generic sense, but it should be enough for our purpose.

Now, you should not receive a proposal 'foo:' when you have already
typed 'foo' in QML, for example.

Change-Id: Ica92182a34636598faedb067d0527e37ca6fee89
Reviewed-on: http://codereview.qt.nokia.com/46
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-20 17:11:39 +02:00
Leandro Melo
99fee33fd1 Completion: Complete prematuraly only if invoked explicitly
Change-Id: I941a94df2f8fb86f340ee04338641fe50c55e1b2
Reviewed-on: http://codereview.qt.nokia.com/45
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-20 17:11:27 +02:00
Leandro Melo
9e6f387bce Completion: Complete automatically only when in sync
Whith the out-of-GUI completion one can have undesired
effects when invoking the completion, continue typing,
getting automatic content added to the editor
asynchronously, and then noticing that the lastly
input characters were "shifted" to a different
position.

Now we only do partial completions or implicit completions
(when there's a single match) if the proposal widget is
still in synch with the editor. In other words, if the
editor has not received input from the moment the completion
was triggered until it was actually displayed.

Change-Id: I31683bd596c9f75b9a48bb79dafb48eec8f12a3e
Reviewed-on: http://codereview.qt.nokia.com/44
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-05-20 17:11:05 +02:00
Friedemann Kleint
a923cee383 Qt version: Add base name of Qt folder to generated display name.
With some smartness to skip over bin, qtbase and display
usr as 'System'. Introduce BaseQtVersion::defaultDisplayName().

Change-Id: I5249bbd7102f40441e7a873d861c525e4194d74f
Reviewed-on: http://codereview.qt.nokia.com/43
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-20 17:00:51 +02:00
Pawel Polanski
4773cdf7c0 Ovi Publisher: Freeze libraries when creating package
Task-number: QTCREATORBUG-772
Change-Id: I925b7f27c1dc3aae14465472c6c32d48dd33d520
Reviewed-on: http://codereview.qt.nokia.com/49
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-20 16:43:27 +02:00
Friedemann Kleint
b25373b304 Project page: Add a tooltip for the Qt version.
Change-Id: I092220ade4cb61645e6c17012d294e93759678db
Reviewed-on: http://codereview.qt.nokia.com/42
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-20 15:50:34 +02:00
Friedemann Kleint
ec8adef4a2 Qt4 Projects: Fix crash when clicking on category items.
Change-Id: Ib50b38a98e2185839c794be51c770e95f7876ee2
Reviewed-on: http://codereview.qt.nokia.com/41
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-20 15:49:10 +02:00
Pawel Polanski
56a73b2921 Crash when no Qt version is defined
Change-Id: Iffef69e328d9b7294c6aeb753219033456efe2c2
Reviewed-on: http://codereview.qt.nokia.com/40
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-20 15:15:40 +02:00
Pawel Polanski
2d80383db1 Now it's looking better
Change-Id: Ic6cbc95feb121f09eb2e14c08a9ab680018dc760
Reviewed-on: http://codereview.qt.nokia.com/39
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-20 15:15:15 +02:00
Thomas Hartmann
cbc511213b QmlDesigner.propertyEditor: remove AllPropertiesBox
This class is not needed anymore and is just confusing.

Change-Id: I6ee3d4090b13d2682ff2f7b3d82ebfe1410a1344
Reviewed-on: http://codereview.qt.nokia.com/37
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-05-20 15:04:45 +02:00
Oswald Buddenhagen
61afe9d365 don't stack up "no highlighting information" info bars
don't try to add another bar one if there is one already

Task-number: QTCREATORBUG-4951
Change-Id: Ia7282a5ee96d3b6b08b3f66c3bc162b1c4a5a015
Reviewed-on: http://codereview.qt.nokia.com/32
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-05-20 13:50:03 +02:00
Christian Kamm
0bf18d008b QmlJS: Find prototype resolution errors.
To avoid lots of follow-up errors where the root cause is a failed
prototype resolution or a prototype cycle.

Task-number: QTCREATORBUG-4952
Change-Id: Id474c8c6c152c993aca8c6c421b6d88eb1481676
Reviewed-on: http://codereview.qt.nokia.com/36
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-05-20 13:33:18 +02:00
Tobias Hunger
044915b2c1 Clang: Improve parser
Change-Id: Ic28973ddc81968075aa6e0ac31c02612589f8024
Reviewed-on: http://codereview.qt.nokia.com/33
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-20 11:58:37 +02:00
hjk
c31bc05e2e analyzer: make output pane not pop up automatically in all cases
Change-Id: Ief96ab7093d78915087a273f3eff0b4489c3b370
Reviewed-on: http://codereview.qt.nokia.com/30
Reviewed-by: hjk
2011-05-20 11:00:28 +02:00
hjk
705d450910 analyzer: fix quotes in messages
Change-Id: I611898d9c253cffaa09fa181a99feaf093ccdbe0
Reviewed-on: http://codereview.qt.nokia.com/29
Reviewed-by: hjk
2011-05-20 11:00:14 +02:00
Thorbjørn Lindeijer
9c882d8079 Don't apply base color when color dialog is cancelled
Previously setBaseColor used to refuse setting an invalid color. It
doesn't do this anymore, so let's just check for this case here.

Change-Id: Ie8a292ca809ac3838c8a52b91a9186dc5dbb992c
Reviewed-on: http://codereview.qt.nokia.com/28
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-05-20 08:33:20 +02:00
Leandro Melo
956bac297b C++ editor: Fix potential crash in completion
There was still a problem in the previous change (that's
why it was reverted) which should be fixed now.

Task-number: QTCREATORBUG-4940
Change-Id: I8a0d993b9f313fc98494cf93fed1f87939a358b1
Reviewed-on: http://codereview.qt.nokia.com/27
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-05-19 18:37:22 +02:00