OSDN Git Service
Leandro Melo [Fri, 20 May 2011 08:27:56 +0000 (10:27 +0200)]
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>
Friedemann Kleint [Fri, 20 May 2011 13:52:58 +0000 (15:52 +0200)]
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>
Pawel Polanski [Fri, 20 May 2011 14:24:07 +0000 (16:24 +0200)]
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>
Friedemann Kleint [Fri, 20 May 2011 13:46:03 +0000 (15:46 +0200)]
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>
Friedemann Kleint [Fri, 20 May 2011 13:40:06 +0000 (15:40 +0200)]
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>
Pawel Polanski [Fri, 20 May 2011 13:04:19 +0000 (15:04 +0200)]
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>
Pawel Polanski [Fri, 20 May 2011 11:43:36 +0000 (13:43 +0200)]
Now it's looking better
Change-Id: Ic6cbc95feb121f09eb2e14c08a9ab680018dc760
Reviewed-on: http://codereview.qt.nokia.com/39
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Thomas Hartmann [Fri, 20 May 2011 12:32:43 +0000 (14:32 +0200)]
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>
Oswald Buddenhagen [Fri, 20 May 2011 09:27:07 +0000 (11:27 +0200)]
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>
Christian Kamm [Fri, 20 May 2011 11:19:16 +0000 (13:19 +0200)]
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>
Tobias Hunger [Fri, 20 May 2011 09:57:30 +0000 (11:57 +0200)]
Clang: Improve parser
Change-Id: Ic28973ddc81968075aa6e0ac31c02612589f8024
Reviewed-on: http://codereview.qt.nokia.com/33
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
hjk [Fri, 20 May 2011 07:12:34 +0000 (09:12 +0200)]
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
hjk [Thu, 19 May 2011 12:42:56 +0000 (14:42 +0200)]
analyzer: fix quotes in messages
Change-Id: I611898d9c253cffaa09fa181a99feaf093ccdbe0
Reviewed-on: http://codereview.qt.nokia.com/29
Reviewed-by: hjk
Thorbjørn Lindeijer [Thu, 19 May 2011 21:14:28 +0000 (23:14 +0200)]
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>
Leandro Melo [Thu, 19 May 2011 16:02:09 +0000 (18:02 +0200)]
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>
Daniel Molkentin [Thu, 19 May 2011 15:14:53 +0000 (17:14 +0200)]
Fix context help for examples
- createRightPaneContextViewer() needs to be called up-front. In the old
order, it would fail the first time.
- Queue opening of help, because we need the editor window to be drawn
before it can be assessed wether to show the help in split mode
Change-Id: Ib2054285efb07ccbfaf3faf089085c16ba432be8
Reviewed-on: http://codereview.qt.nokia.com/22
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kandeler [Thu, 19 May 2011 15:38:30 +0000 (17:38 +0200)]
Maemo: Fix device configuration dialog for all OS types.
There could potentially be types other than GenericLinux that
don't use dpkg or rpm.
Change-Id: I62a03aa1f532a4f589be8e43e07410beb1370cb2
Reviewed-on: http://codereview.qt.nokia.com/26
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Leandro Melo [Thu, 19 May 2011 14:48:08 +0000 (16:48 +0200)]
Revert "C++ editor: Fix potential crash in completion"
This reverts commit
a395022a84149884771eefee9577ba2441ba45a4.
There are some undesired side effects...
Change-Id: I001ed375911a4ffda5bd25c804ce06f99be40e3c
Reviewed-on: http://codereview.qt.nokia.com/25
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kandeler [Thu, 19 May 2011 14:18:39 +0000 (16:18 +0200)]
Maemo: Fix package file watching.
Had been broken by
45c9cf7a1298feed925d18596c30ac9c6cd1dac5 ff.
This change uses the FileManager and thereby also improves interaction
with external editors that change the inode (e.g. emacs).
Change-Id: I6d889d435931eb0199de93610bea643e50e9f025
Reviewed-on: http://codereview.qt.nokia.com/24
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Leandro Melo [Thu, 19 May 2011 13:14:53 +0000 (15:14 +0200)]
C++ editor: Fix potential crash in completion
Task-number: QTCREATORBUG-4940
Change-Id: If55c2ddc7949cbd31029eef8317b4d0a015f272e
Reviewed-on: http://codereview.qt.nokia.com/17
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Tobias Hunger [Thu, 19 May 2011 14:11:59 +0000 (16:11 +0200)]
MSVC: Fix parser
* Fix parser to handle error message send in by a user
* Add unit test
Change-Id: I3b37ada49ef3737261211ac41ae80504b2a767fa
Reviewed-on: http://codereview.qt.nokia.com/23
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Daniel Molkentin [Wed, 18 May 2011 09:38:35 +0000 (11:38 +0200)]
Don't open files and help if someone chooses to cancel loading an example.
Task-Number: QTCREATORBUG-4414
Change-Id: I0272091d185fe6a9ac23022eb4efb723eb541494
Reviewed-on: http://codereview.qt.nokia.com/21
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Fawzi Mohamed [Thu, 19 May 2011 13:39:22 +0000 (15:39 +0200)]
Editor: fix to always call forceReadOnly before activation
Move the call to force readOnly to before the activation for the editors
that had it after their activation call.
Not having signals, currently dynamic changes of the editor read only
state are not really supported, and on windows some actions remained
activated.
Task-number: QTCREATORBUG-4774
Change-Id: I09a84c6e558ddf61aeedb928f8688f6ed65e89c0
Reviewed-on: http://codereview.qt.nokia.com/20
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
dt_ [Thu, 19 May 2011 13:21:02 +0000 (15:21 +0200)]
Fix importing builds
Change-Id: Idbd01ad4cd44e4e1ac168ae112bbe9f9d69eb583
Task-Nr: QTCREATORBUG-4935
Reviewed-on: http://codereview.qt.nokia.com/18
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
dt_ [Thu, 19 May 2011 12:08:41 +0000 (14:08 +0200)]
Make SettingsDialog robust against multiple accept()/rejects()
That can happen if the user clicks very fast due to the multiple
levels of event loops.
Task-Nr: QTCREATORBUG-4818
Change-Id: I9c00dbf957a587c6e5839afebdd71e84b8c4a3c8
Reviewed-on: http://codereview.qt.nokia.com/16
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kandeler [Thu, 19 May 2011 10:17:37 +0000 (12:17 +0200)]
Maemo: Make more forward-compatible.
Change-Id: I864cf2a82af538a7b8e41b8117546cb7710481c7
Reviewed-on: http://codereview.qt.nokia.com/10
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Christian Kandeler [Thu, 19 May 2011 10:42:37 +0000 (12:42 +0200)]
Maemo: Don't unify packaging metadata between targets as rigorously.
This allows people to do external changes to their files without
Creator overwriting them.
Change-Id: I71fc7cf6dabb9a61762992b8c01f971f563e17ab
Reviewed-on: http://codereview.qt.nokia.com/12
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Fawzi Mohamed [Thu, 19 May 2011 10:25:27 +0000 (12:25 +0200)]
Editor: fix disabling modifying actions for read-only editors
Now correctly disables all modifying actions and shortcuts of
texteditoractionhandler if the editor is readonly.
Task-number: QTCREATORBUG-4774
Change-Id: Ic212a2fe3b6dcc18e2fbc461d24bed031c67f6a2
Reviewed-on: http://codereview.qt.nokia.com/7
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
hjk [Thu, 19 May 2011 11:43:19 +0000 (13:43 +0200)]
analyzer: style
And test for *rr*.
Change-Id: I7905e5df8f981b683d9552fb7cc15f9b8f16624e
Reviewed-on: http://codereview.qt.nokia.com/15
Reviewed-by: hjk
Christian Kamm [Thu, 19 May 2011 11:19:08 +0000 (13:19 +0200)]
C++ indenter: Treat extern "C" like namespace.
Change-Id: Ib0553d35fbd83aada2b8809aa008b1f75ca77c32
Done-with: Erik Verbruggen
Reviewed-on: http://codereview.qt.nokia.com/14
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
Christian Kamm [Thu, 19 May 2011 11:06:49 +0000 (13:06 +0200)]
C++ indenter: Fix extra specifier in return type of func decl.
Like
struct Foo bar() { }
Change-Id: I946937c23d1660909757952a5a3bd400c4781826
Reviewed-on: http://codereview.qt.nokia.com/13
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
Friedemann Kleint [Thu, 19 May 2011 09:30:38 +0000 (11:30 +0200)]
Designer: Compilation with Qt 5.
Test the new Qt Designer integration interfaces.
Change-Id: I8364167d5be3e7c361b192318b0bba7fb70d0f2f
Reviewed-on: http://codereview.qt.nokia.com/9
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Tobias Hunger [Thu, 19 May 2011 09:15:43 +0000 (11:15 +0200)]
CLang: Fix id
Change-Id: Icdac7eadd2f4323b884f6dd963a4716a93d00034
Reviewed-on: http://codereview.qt.nokia.com/8
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
hjk [Thu, 19 May 2011 08:37:53 +0000 (10:37 +0200)]
debugger: fix std::deque dumper
Task-number: QTCREATORBUG-4936
Tobias Hunger [Thu, 19 May 2011 08:05:45 +0000 (10:05 +0200)]
Clang: Really use monospaced font for position indicators
Change-Id: Ieabbe313ea5c508611355e23c41b174a2d253a4e
Friedemann Kleint [Thu, 19 May 2011 08:01:50 +0000 (10:01 +0200)]
Designer: Use core settings instead of keeping QSettings instance.
Friedemann Kleint [Thu, 19 May 2011 07:59:13 +0000 (09:59 +0200)]
Fix exit crash in callgrind.
Thorbjørn Lindeijer [Tue, 17 May 2011 10:12:52 +0000 (12:12 +0200)]
Fixed crashes in Observer mode related to infinite bounding rects
Bug fixed by avoiding uniting or subtracting QPolygonF with potentially
infinite coordinates.
The LiveSelectionIndicator now uses a QGraphicsRectItem rather than a
QGraphicsPolygonItem and displays only the boundaries of selected
objects, not including their children.
The SubcomponentMaskLayerItem now works with rectangles and uses a
QRegion to determine the area around the current context, converting
this to a polygon only as a last step.
Reviewed-by: Kai Koehne
Task-number: QTCREATORBUG-4559
Change-Id: I266f5387fa67017fc50215282a95b4ee6498be6d
(cherry-picked from
d03065da2999b8539d8c5160b58d56dd94373d6f in Qt 4.8)
hjk [Wed, 18 May 2011 17:35:42 +0000 (19:35 +0200)]
analyzer: simplify AnalyzerSubConfigFactory setup
hjk [Wed, 18 May 2011 15:05:49 +0000 (17:05 +0200)]
analyzer: style and simplification
hjk [Wed, 18 May 2011 14:48:36 +0000 (16:48 +0200)]
utils/detailwidget: style & make stuff private
Tobias Hunger [Wed, 18 May 2011 16:39:14 +0000 (18:39 +0200)]
Parser: Make parser test engine more strict
* Fix unit tests to work with this stricter version
Change-Id: Iaf6d333e4b4df54ddc340d261ce28538bfa1f3cf
Tobias Hunger [Wed, 18 May 2011 16:38:58 +0000 (18:38 +0200)]
Clang: Add parser for clang output
Change-Id: Ic5bb4742e07009172d64acb53c07659c3f4d640a
hjk [Wed, 18 May 2011 13:56:01 +0000 (15:56 +0200)]
analyzer: cleanup
hjk [Wed, 18 May 2011 13:47:23 +0000 (15:47 +0200)]
analyzer: make the callgrind "functions" view a dockwidget again
Leandro Melo [Wed, 18 May 2011 12:08:19 +0000 (14:08 +0200)]
c++ editor: Fix automatic completion for includes
Reviewed-by: Roberto Raggi
Kai Koehne [Wed, 18 May 2011 13:10:43 +0000 (15:10 +0200)]
cdbext: Fix msvc warnings
Change-Id: Ib1604c2e36d2a4dbfb7edccb5be0e4c401b026c5
Reviewed-by: Friedemann Kleint
Kai Koehne [Wed, 18 May 2011 12:30:26 +0000 (14:30 +0200)]
MSVC: Fix compile warnings from botan header files
Change-Id: I802579ab51fb0e65578444df9603cd7721231a66
Reviewed-by: Friedemann Kleint
Leandro Melo [Wed, 18 May 2011 10:28:53 +0000 (12:28 +0200)]
C++ editor: Remove scanning/caching of includes
With the completion now in a separate thread this should
no longer be necessary.
Reviewed-by: Roberto Raggi
Christiaan Janssen [Wed, 18 May 2011 10:15:18 +0000 (12:15 +0200)]
QmlLivePreview: avoid compiler warnings on gcc on mac
Reviewed-by: Roberto Raggi
Tobias Hunger [Wed, 18 May 2011 09:52:21 +0000 (11:52 +0200)]
Maemo: Fix possible assert
Treat invalid Qt versions as not registered at all. This stops
creator from looking for a toolchain which is not there as the qmake
path is wrong.
Change-Id: I49a2a74a466d20c4cd1c8f4f72d8dbbbcefc9559
Kai Koehne [Fri, 13 May 2011 15:41:02 +0000 (17:41 +0200)]
QmlDebugging: Enable linking the library automatically for debug builds
Change-Id: I31c6ce649ec5a106ac8d5a556659a26f584b1d09
Reviewed-by: dt
Kai Koehne [Tue, 17 May 2011 10:40:57 +0000 (12:40 +0200)]
QmlDebugging: Enable QML Debugger language for Qt Quick Applications
Enable the QML debugger by default for run configurations generated for
a Qt Quick Application based project. This is done by checking the file
list for a 'qmlapplicationviewer/qmlapplicationviewer.pri'.
Change-Id: Ia19d2022808b068c2e525aa28e938b7f7125c35d
Reviewed-by: dt
Leandro Melo [Fri, 15 Apr 2011 14:19:23 +0000 (16:19 +0200)]
New code assist API
This is a re-work of our completion engine. Primary goals are:
- Allow the computation to run in a separate thread so the GUI is not locked.
- Support a model-based approach. QStrings are still needed (filtering, etc), but
internal structures are free to use more efficient representations.
- Unifiy all kinds of *assist* into a more reusable and extensible framework.
- Remove unnecessary dependencies on the text editor so we have more generic
and easily "plugable" components (still things to be resolved).
Christiaan Janssen [Tue, 17 May 2011 16:03:59 +0000 (18:03 +0200)]
QmlProfiler: removed fixed height
Erik Verbruggen [Tue, 17 May 2011 15:03:24 +0000 (17:03 +0200)]
Fixed invalid parsing of boolean expression "x < y && z > this".
Task-number: QTCREATORBUG-4362
Reviewed-by: Roberto Raggi
Leena Miettinen [Tue, 17 May 2011 15:01:04 +0000 (17:01 +0200)]
Doc: fix link
Thomas Hartmann [Tue, 17 May 2011 10:04:51 +0000 (12:04 +0200)]
QmlDesigner: fix warnings
hjk [Tue, 17 May 2011 14:50:27 +0000 (16:50 +0200)]
fakevim: parse <Esc> from script files
hjk [Tue, 17 May 2011 14:47:10 +0000 (16:47 +0200)]
debugger: show something when editing
dt [Thu, 12 May 2011 09:53:58 +0000 (11:53 +0200)]
QtVersion: Add support code for the sdk
Friedemann Kleint [Tue, 17 May 2011 14:18:22 +0000 (16:18 +0200)]
Resource Editor: Do not link to Qt Designer.
yRemove unused dependency.
Christian Kandeler [Tue, 17 May 2011 14:02:05 +0000 (16:02 +0200)]
Toolchains: Small refactoring for better extensibility.
Reviewed-by: Tobias Hunger
dt_ [Tue, 17 May 2011 14:00:51 +0000 (16:00 +0200)]
Make pastebin.com a link in the options page
Task-Nr: QTCREATORBUG-4925
dt_ [Tue, 17 May 2011 13:56:09 +0000 (15:56 +0200)]
Show icon for invalid qt's without name
Task-Nr: QTCREATORBUG-4899
Fawzi Mohamed [Tue, 17 May 2011 13:14:43 +0000 (15:14 +0200)]
Option to merge stderr in application output
When activated shows correct interleaving of stdout and stderr messages,
but looses stderr highlighting.
Task-number: QTCREATORBUG-4821
Reviewed-by: ossi
Oswald Buddenhagen [Tue, 17 May 2011 12:43:01 +0000 (14:43 +0200)]
fix "Debugger:" label alignment
on the way also greatly simplify the code in most copies. it was
probably trying to do what i did, but failed miserably.
Leena Miettinen [Tue, 17 May 2011 11:45:04 +0000 (13:45 +0200)]
UI text: fix capitalization of labels and tooltips
Reviewed-by: Thomas Hartmann
hjk [Tue, 17 May 2011 10:58:53 +0000 (12:58 +0200)]
debugger: allow hex etc formatting for anything that looks like an integer
hjk [Tue, 17 May 2011 09:30:44 +0000 (11:30 +0200)]
debuggger: allow change of display for templated types
Friedemann Kleint [Tue, 17 May 2011 10:19:24 +0000 (12:19 +0200)]
Debugger [CDB]: Enable Assignment to string classes.
Assign to QString/QByteArray following gdbmacros.py
implementation (call resize if required, copy data into buffer).
Assign to std::[w]string only it has sufficient memory
(since std::string<>.resize cannot be called).
Robert Loehning [Mon, 16 May 2011 15:53:52 +0000 (17:53 +0200)]
Improved German translation
Roberto Raggi [Mon, 28 Mar 2011 11:21:37 +0000 (13:21 +0200)]
Added support to C++ symbols rewriting.
This should simplify full C++ template instantiations.
Reviewed-by: Christian Kamm
Christiaan Janssen [Mon, 9 May 2011 15:38:56 +0000 (17:38 +0200)]
QmlLivePreview: adding animations and transitions
Reviewed-by: Kai Koehne
Christiaan Janssen [Mon, 9 May 2011 10:51:54 +0000 (12:51 +0200)]
QmlLivePreview: adding states to an item
Reviewed-by: Kai Koehne
hjk [Mon, 16 May 2011 18:04:17 +0000 (20:04 +0200)]
debugger: add dumper for Eigen::Matrix
Thorbjørn Lindeijer [Mon, 16 May 2011 17:34:33 +0000 (19:34 +0200)]
Improved resize behavior of the Filter Configuration dialog
Tobias Hunger [Mon, 16 May 2011 16:06:27 +0000 (18:06 +0200)]
Refactor some code in buildstepspage
* Rename m_buildSteps to m_buildStepsData
* Turn BuildStepsWidgetStruct into class and rename it to
BuildStepsWidgetData
* Use constructor/destructor for that class
* Turn m_buildStepsData into a QList<... *> to have the
necessary control about when destruction happens
Reviewed-by: Fawzi Mohamed
Tobias Hunger [Mon, 16 May 2011 16:03:56 +0000 (18:03 +0200)]
Fix possible crash in BuildStepsPage
Task-number: QTCREATORBUG-4894
Reviewed-by: Fawzi Mohamed
Tobias Hunger [Mon, 16 May 2011 10:37:50 +0000 (12:37 +0200)]
Fix possible crash in qmakestepwidget
Reviewed-by: dt
Christiaan Janssen [Mon, 16 May 2011 15:06:52 +0000 (17:06 +0200)]
QmlDebugger: update location marker while debugging
Reviewed-by: hjk
Oswald Buddenhagen [Mon, 16 May 2011 15:32:23 +0000 (17:32 +0200)]
Merge remote-tracking branch 'origin/2.2'
Conflicts:
src/plugins/debugger/breakhandler.cpp
src/plugins/debugger/cdb/cdbengine.cpp
hjk [Mon, 16 May 2011 15:21:43 +0000 (17:21 +0200)]
fakevim: further split 'handleCommand'
hjk [Mon, 16 May 2011 13:46:35 +0000 (15:46 +0200)]
debugger: take a few string comparisons off the critical path
hjk [Mon, 16 May 2011 13:14:30 +0000 (15:14 +0200)]
debugger: remove custom 'select' function from dumpers
hjk [Mon, 16 May 2011 12:07:10 +0000 (14:07 +0200)]
debugger: use python's built-in min()
Leena Miettinen [Mon, 16 May 2011 14:55:10 +0000 (16:55 +0200)]
UI text: edit field labels and tooltips
Reviewed-by: Thomas Hartmann
Leena Miettinen [Mon, 16 May 2011 14:52:51 +0000 (16:52 +0200)]
Doc: update setting breakpoints
Update screen shots
Thomas Hartmann [Mon, 16 May 2011 14:19:21 +0000 (16:19 +0200)]
QmlDesigner.qmlModelView: fixes adding imports
We use requiredImport() and only add an import if it does
not exists before (even with alias).
Thomas Hartmann [Mon, 16 May 2011 14:17:37 +0000 (16:17 +0200)]
QmlDesigner.rewriteAction: fixes rewriter for import alias
Thomas Hartmann [Mon, 16 May 2011 14:16:59 +0000 (16:16 +0200)]
QmlDesigner.metaInfo: fixes for as imports
This patch also allows to luckup C++ types without
specified version.
Thomas Hartmann [Mon, 16 May 2011 14:15:31 +0000 (16:15 +0200)]
QmlDesigner.rewriter: fix (optimization)
We only change a value if different.
Thomas Hartmann [Mon, 16 May 2011 14:14:38 +0000 (16:14 +0200)]
QmlDesigner.documentController: fixing toText for alias imports
Thomas Hartmann [Mon, 16 May 2011 14:13:07 +0000 (16:13 +0200)]
QmlDesigner.model: extending Import:toString
This allows skipping the alias part.
Thomas Hartmann [Mon, 16 May 2011 14:12:29 +0000 (16:12 +0200)]
QmlDesigner: using hasImport
This change avoids adding an import if the same import with different alias
already exists.
Thomas Hartmann [Mon, 16 May 2011 14:10:50 +0000 (16:10 +0200)]
QmlDesigner.model: adding hasImport
The method hasImport() is able to ignore alias imports.
Thomas Hartmann [Mon, 16 May 2011 14:10:02 +0000 (16:10 +0200)]
QmlDesigner.model: add convertTypeToImportAlias() to ModelNode
We expose convertTypeToImportAlias() in ModelNode.
Thomas Hartmann [Mon, 16 May 2011 14:09:09 +0000 (16:09 +0200)]
QmlDesigner.rewriterView: adding convertTypeToImportAlias()
We need this function to handle alias imports.
Thomas Hartmann [Mon, 16 May 2011 14:07:43 +0000 (16:07 +0200)]
QmlDesigner.metaInfo: extending itemlibrary info
I added forceImport.
Thomas Hartmann [Mon, 16 May 2011 14:06:32 +0000 (16:06 +0200)]
QmlDesigner.propertyEditor: use simplified typename in captions