OSDN Git Service
Leandro Melo [Fri, 27 May 2011 08:58:26 +0000 (10:58 +0200)]
Documentation: More on code assist
Change-Id: Icd4edd9fbd2067e46b1c8933d8e9139dafba3e67
Reviewed-on: http://codereview.qt.nokia.com/183
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
dt_ [Thu, 26 May 2011 13:56:36 +0000 (15:56 +0200)]
Add BuildConfiguration::disabledReason()
Not yet used.
Change-Id: I1f8763163e5f19e41d8e98517cf13d9bbb1e6ff8
Reviewed-on: http://codereview.qt.nokia.com/189
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
dt_ [Thu, 26 May 2011 13:39:52 +0000 (15:39 +0200)]
Remove dead code
Change-Id: I935ecbc8616bff78fb5339f467a5832687461e5b
Reviewed-on: http://codereview.qt.nokia.com/188
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
dt_ [Thu, 26 May 2011 13:33:24 +0000 (15:33 +0200)]
Remove BuildConfiguration parameter from RunConfiguration::isEnabled
Noone used it anyway, makes the code easier to refactor later.
Change-Id: I367c3f15ec5034740760dfe1becd3063b2e19dc1
Reviewed-on: http://codereview.qt.nokia.com/187
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
dt_ [Thu, 26 May 2011 13:32:34 +0000 (15:32 +0200)]
Fix MaemoRunConfiguration::updateFactoryState()
Change-Id: I1a79b4709c25fbaa5a09c907794fc6adf8165dd0
Reviewed-on: http://codereview.qt.nokia.com/186
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
dt_ [Thu, 26 May 2011 12:19:40 +0000 (14:19 +0200)]
Obviously redudant code
Change-Id: Iee711600d55c52cef16d518cf70bf047d3bbe085
Reviewed-on: http://codereview.qt.nokia.com/185
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Fri, 27 May 2011 09:02:57 +0000 (11:02 +0200)]
debugger: fix expansion of object in gdb tooltips on first click
Change-Id: Ia157f8fb7f1b9ff8a8161c8a726d1d483b81e54f
Reviewed-on: http://codereview.qt.nokia.com/179
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Wed, 25 May 2011 06:58:25 +0000 (08:58 +0200)]
Debugger: don't auto-continue on SIGTRAP if the user ordered a stop
Task-number: QTCREATORBUG-4968
Change-Id: I48d49c3098be3392c9ef7e6b0112149c7def22f9
Reviewed-on: http://codereview.qt.nokia.com/97
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Fri, 27 May 2011 09:00:39 +0000 (11:00 +0200)]
QmlJS: Fix import cache usage with 'as' imports.
Change-Id: I6c057e494f87df927adc7b83c6caf1ecc729ac65
Reviewed-on: http://codereview.qt.nokia.com/176
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Fri, 27 May 2011 08:43:06 +0000 (10:43 +0200)]
QmlJS: Separate imported types and imported JS scopes.
Task-number: QTCREATORBUG-4981
Change-Id: I06d3e428ca4928296a3d5977aeff29fc3217c37c
Reviewed-on: http://codereview.qt.nokia.com/175
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
hjk [Fri, 27 May 2011 09:36:43 +0000 (11:36 +0200)]
Merge "Merge remote-tracking branch 'origin/2.2'"
Oswald Buddenhagen [Fri, 27 May 2011 09:18:14 +0000 (11:18 +0200)]
Merge remote-tracking branch 'origin/2.2'
Change-Id: Ia0b356840212aec92e712eb4c905f97a1c1dc53f
hjk [Thu, 26 May 2011 14:35:36 +0000 (16:35 +0200)]
debugger: introduce a parameter struct for updateLocal
Change-Id: I05ecc935e1b6cf9483f23624f18e4dc5b9f295f3
Reviewed-on: http://codereview.qt.nokia.com/178
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Thu, 26 May 2011 13:13:37 +0000 (15:13 +0200)]
debugger: simplify updateLocals() parameters
Change-Id: I7da344c8eeade5153fb0b98a45e139654a2119dd
Reviewed-on: http://codereview.qt.nokia.com/177
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Fri, 27 May 2011 07:35:47 +0000 (09:35 +0200)]
C++ indenter: Make CppCodeStyleSettings a class.
Also register it with the meta type system.
Change-Id: Id720e43d19765283765e7dbbd46820ba9cfb1be7
Reviewed-on: http://codereview.qt.nokia.com/172
Reviewed-by: Bill King <bill.king@nokia.com>
Leandro Melo [Thu, 26 May 2011 16:09:17 +0000 (18:09 +0200)]
Documentation: Code assist API
Change-Id: Id703725708823edc24171f7c1b28befe99032d63
Reviewed-on: http://codereview.qt.nokia.com/154
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Thorbjørn Lindeijer [Thu, 26 May 2011 12:21:44 +0000 (14:21 +0200)]
QmlJSInspector: Fixed multi-selection bug
Nothing useful can be done with multi-selection at the moment, but this
bug was introduced in
8d0601515ebf54568609b2c7e73a8a91c63fdc26 and is
better to fix straight away.
What happened was that when multiple items are selected in the observed
QML application, Qt Creator would pick the first and send that back as
the new selection. This made it impossible to select more than one item.
Task-number: QTCREATORBUG-3426
Change-Id: I68283480af5e0a21e32e51a49848ff9a809ed5ec
Reviewed-on: http://codereview.qt.nokia.com/151
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Christian Kandeler [Thu, 26 May 2011 14:42:20 +0000 (16:42 +0200)]
RemoteLinux: Get rid of unnecessary proparser dependency.
Change-Id: I9c6d3b23b2faceb78f4c2a07e577d83c51889f5c
Reviewed-on: http://codereview.qt.nokia.com/152
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Leena Miettinen [Wed, 25 May 2011 11:49:53 +0000 (13:49 +0200)]
Doc: selecting Qt version when building apps for Symbian for the Ovi Store
Change-Id: I54aadfbafd18601a3b0d6420b8ebb00cb082d803s
Reviewed-on: http://codereview.qt.nokia.com/150
Reviewed-by: hjk <qthjk@ovi.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: Ib2054285efb07ccbfaf3faf089085c16ba432be8z
(cherry picked from commit
c86e81c362411d1f766d36f0f0946a5039fb65fd)
Reviewed-on: http://codereview.qt.nokia.com/149
Reviewed-by: hjk <qthjk@ovi.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: I0272091d185fe6a9ac23022eb4efb723eb541494x
(cherry picked from commit
15ac4f0e21c63826a70650e68c433898306307d1)
Reviewed-on: http://codereview.qt.nokia.com/148
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kandeler [Wed, 25 May 2011 09:23:25 +0000 (11:23 +0200)]
Maemo: Create dedicated plugin.
No change in functionality for now. More support for generic remote
Linux support is planned to be added.
The changes in decreasing order of magnitude:
1) Move contents of qt4projectmanager/qt-maemo to new "RemoteLinux" plugin.
2) Make some classes in qt4nodes public for now. More decoupling
in that area will follow.
3) Fix some minor problems uncovered by the move.
Change-Id: I51d0c7977c10019eb6080cd6620bc28ecebad3c4
Reviewed-on: http://codereview.qt.nokia.com/106
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Alessandro Portale [Wed, 25 May 2011 18:47:02 +0000 (20:47 +0200)]
Native dir separators in "Import build" dialog
Change-Id: I532943d61b46046ad3ce36b0b85a5ef5a0208376
Reviewed-on: http://codereview.qt.nokia.com/127
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Leena Miettinen [Thu, 26 May 2011 10:58:02 +0000 (12:58 +0200)]
Doc: fix capitalization
Change-Id: I00526a662ea6721256f7bda23d870261f4f43558
Reviewed-on: http://codereview.qt.nokia.com/147
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Leandro Melo [Thu, 26 May 2011 10:10:08 +0000 (12:10 +0200)]
C++ editor: Share the model data acrross completion items
More than one proposal item could be accessed during an iteration.
So they should not take ownershipt of the data, but simply share it.
Change-Id: I7b81b8772cd8ad4d6c2332ba6b5bc320055cd5a2
Reviewed-on: http://codereview.qt.nokia.com/136
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Pawel Polanski [Wed, 25 May 2011 14:14:34 +0000 (16:14 +0200)]
CODA: Coda renamed to CODA
Change-Id: I9d9ca8f576c3ecfa19fd3832d3aa685c6ac7fa89
Reviewed-on: http://codereview.qt.nokia.com/120
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Pawel Polanski [Wed, 25 May 2011 14:08:13 +0000 (16:08 +0200)]
CODA: Rename TCF, TCF TRK to CODA
Change-Id: I92d9bc873f62d04c149e7347145701d8a11c232c
Reviewed-on: http://codereview.qt.nokia.com/119
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Leandro Melo [Thu, 26 May 2011 09:29:25 +0000 (11:29 +0200)]
C++ editor: Check _ to accept idle editor completion
In addition to letters and numbers.
Change-Id: I89ec68c50a62516cc0b91d267fd96bb908cbf8bc
Reviewed-on: http://codereview.qt.nokia.com/131
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Leandro Melo [Thu, 26 May 2011 09:07:41 +0000 (11:07 +0200)]
Completion: Apply perfect match whenever not invoked explicitly
This should not only be when the editor is idle but whenever the
completion was not invoked explicitly.
Change-Id: I0f3dbbe2f5db66ae3e1f57c7039a93f74f31e1dc
Reviewed-on: http://codereview.qt.nokia.com/130
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Thomas Hartmann [Thu, 26 May 2011 10:10:02 +0000 (12:10 +0200)]
QmlDesigner.rewriter: crash fix
When converting nodes into implcit components the default properties
turns from a list property into a (single) node property.
This patch takes this into account.
Change-Id: I85f7ee1f8109da0c001804a0804a07b7acdee3ca
Reviewed-on: http://codereview.qt.nokia.com/135
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Thu, 26 May 2011 10:08:18 +0000 (12:08 +0200)]
QmlDesigner.rewriter: crashfix
Task-number: QTCREATORBUG-4923
The photoviewer example crashed. This is a workaround so
a Component defined inside a file is not turned into
an implicit component.
Change-Id: Ia071be96bac7a735beecfa82cbedae3a04a31bc3
Reviewed-on: http://codereview.qt.nokia.com/134
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Thomas Hartmann [Thu, 26 May 2011 09:35:54 +0000 (11:35 +0200)]
QmlDesigner.propertyEditor: fixes for spinboxes
Fixing mouse repeat.
Task-number: QTCREATORBUG-4990
Change-Id: I5a41bac8e11d874672b70fd518d8a90f8ffe56e9
Reviewed-on: http://codereview.qt.nokia.com/132
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Pawel Polanski [Wed, 25 May 2011 13:01:29 +0000 (15:01 +0200)]
Publish to OVi: Freeze performed only for dynamic libs
An extra effort is added when one of the
projects is a dll project. Then additional
cleans, freezes and builds are started
Change-Id: Ice8fe7e9c3f9e236f816c11b0cfdb0a98b396056
Reviewed-on: http://codereview.qt.nokia.com/114
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Pawel Polanski [Wed, 25 May 2011 08:27:19 +0000 (10:27 +0200)]
One shall not shout at our users
Change-Id: I15a25151fc013dba3f10025fdeef6552b207233e
Reviewed-on: http://codereview.qt.nokia.com/102
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Pawel Polanski [Wed, 25 May 2011 08:13:06 +0000 (10:13 +0200)]
White space changes
The white spaces annoy the hell outta me
Change-Id: I464a390dca48dbd7d8af9acc9fde7bc5a5eba308
Reviewed-on: http://codereview.qt.nokia.com/101
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Pawel Polanski [Tue, 24 May 2011 14:25:06 +0000 (16:25 +0200)]
Publis to Ovi: Implementing PublishStep with wipe function
Make Publish to Ovi no so "hardcoded"
and base it upon custom steps.
Now the code is recleaned and rebuild after
freeze
Change-Id: I555136d58f728d563eb7dabcb48f314ce4a19003
Reviewed-on: http://codereview.qt.nokia.com/92
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
dt_ [Wed, 25 May 2011 14:22:24 +0000 (16:22 +0200)]
Fix "Show in shell/terminal" to use the correct directory
Change-Id: I6a33e3f47e6b4ca5256f4cababd4f452be298676
Task-Nr: QTCREATORBUG-4851
Reviewed-on: http://codereview.qt.nokia.com/121
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
dt_ [Wed, 25 May 2011 10:54:14 +0000 (12:54 +0200)]
Qt4Project: updateFileList after adding files via the new file wizard
Task-Nr: QTCREATORBUG-4976
Change-Id: I6d200a0b223e5a9aa601acbe6dbe064a5414b7dc
Reviewed-on: http://codereview.qt.nokia.com/118
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
dt_ [Tue, 24 May 2011 17:08:31 +0000 (19:08 +0200)]
Revert "Fix import of existing builds"
This reverts commit
8cd3b54949bf0be5a7d1b75c4e591b0b79dab990.
Conflicts:
src/plugins/qt4projectmanager/qmakestep.cpp
src/plugins/qt4projectmanager/qmakestep.ui
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
Change-Id: I63af95b8dd7010c50318f276ef524c00a58995bb
Reviewed-on: http://codereview.qt.nokia.com/117
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Thorbjørn Lindeijer [Wed, 25 May 2011 11:42:48 +0000 (13:42 +0200)]
DeclarativeObserver: Fixed duplicates in item selection
Only add items to the current selection that aren't already part of it.
Also removed checking item for null, since it doesn't make sense to
include null pointers in the list of items to select.
Task-number: QTCREATORBUG-3426
Change-Id: I5a365570f87f72665b3382d05ca9937f56e8956b
Reviewed-on: http://codereview.qt.nokia.com/111
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Leandro Melo [Wed, 25 May 2011 11:22:22 +0000 (13:22 +0200)]
C++ editor: Restrict outline combo popup width
Use Creator's main window as a reference for the width. Note that
this does not necessarily imply they are aligned.
Task-number: QTCREATORBUG-4021
Change-Id: Id0be8a7435d9b3f9eaab638f7a82bb0bd1afa192
Reviewed-on: http://codereview.qt.nokia.com/109
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Kai Koehne [Wed, 25 May 2011 11:27:01 +0000 (13:27 +0200)]
Qt4Target: Compile fix
Remove conflict markers.
Change-Id: Ie54881eff9df4966d093782841db4db5b4c4268f
Reviewed-on: http://codereview.qt.nokia.com/110
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kai Koehne [Fri, 20 May 2011 10:52:59 +0000 (12:52 +0200)]
BuildConfiguration: Adapt name if Qt version changes
Change-Id: I1a34cb51f73af9779d6bdb07324d5dadcb5585b3
Leena Miettinen [Wed, 25 May 2011 09:37:45 +0000 (11:37 +0200)]
Doc: keyboard shortcuts to turn text into lowercase or uppercase
Task-number: QTCREATORBUG-563
Change-Id: Id91833f068aa56100d2fc2dc95906ef4d08e781d
Reviewed-on: http://codereview.qt.nokia.com/103
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
Christian Kamm [Wed, 25 May 2011 10:05:52 +0000 (12:05 +0200)]
C++ indenter: Fix reindenting 'Q_SIGNALS:'.
Change-Id: Ieb2a7673e99dec06d925263f48b39c0c3a4d2fa1
Reviewed-on: http://codereview.qt.nokia.com/108
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Christian Kamm [Wed, 25 May 2011 09:48:47 +0000 (11:48 +0200)]
QmlJS: Initialize error state in PrototypeIterator.
Change-Id: I231b847607d0558080d0dc0b6392bae5b833d65a
Reviewed-on: http://codereview.qt.nokia.com/107
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Thomas Hartmann [Wed, 25 May 2011 09:19:59 +0000 (11:19 +0200)]
QmlDesigner.property: do not allow to enter ',' for margins.
If minimum/maximum < 1000 the validator does not allow ','.
Allowing ',' confuses users.
Change-Id: I5ce3b809ea03552e03f11461d677d6212edb3aa4
Reviewed-on: http://codereview.qt.nokia.com/105
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Wed, 25 May 2011 08:58:43 +0000 (10:58 +0200)]
QmlProject: Don't crash if there's no active target.
Change-Id: I0fd95f0d388f4ba06936ec9164a91a3c53a0f005
Reviewed-on: http://codereview.qt.nokia.com/104
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Friedemann Kleint [Wed, 25 May 2011 07:25:04 +0000 (09:25 +0200)]
Fix another crash when BaseQtVersion == 0.
Change-Id: I635bbc5c0120f8bf15b918ef8205cf72298720f0
Reviewed-on: http://codereview.qt.nokia.com/98
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Thorbjørn Lindeijer [Tue, 24 May 2011 12:08:09 +0000 (14:08 +0200)]
DeclarativeObserver: Removed the SubcomponentEditorTool
This tool made selecting items in your QML app more complicated than
necessary. Now, left-click will always just select the top-most item
under the mouse and right-click will allow you to select any of the
items below.
Also, the highlighted bounding rect now always applies to just one
item, instead of also including the children bounding rect.
Reviewed-by: Kai Koehne
Change-Id: I17b5ab397d951fd68711590469ca6e723a9cb0e6
(backported from Qt 4.8 commit
935472c16fc53ee43e1e680ed0122e6363282a8e)
Reviewed-on: http://codereview.qt.nokia.com/89
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Thorbjørn Lindeijer [Tue, 24 May 2011 12:07:50 +0000 (14:07 +0200)]
QmlJSInspector: Removed context path related things
Apparently this part of the protocol was already not being used at all.
Now that the SubcomponentEditorTool will be removed it is no longer
relevant.
Change-Id: I5710fe815be233548e590e90410b85ed4fa3487c
Reviewed-on: http://codereview.qt.nokia.com/88
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
hjk [Wed, 25 May 2011 07:31:03 +0000 (09:31 +0200)]
QmlJSCodeStyleSettingsPage: compile fix
Was not compilable with namespaced Qt
Change-Id: Ieab68bb67e6421afbc4e07417c0196d419697f70
Reviewed-on: http://codereview.qt.nokia.com/100
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Jarek Kobus [Wed, 25 May 2011 06:50:01 +0000 (08:50 +0200)]
Implement qml tab settings
Change-Id: I0b7365b5b3d7538f2b4a8c5eaff3420f448dd5be
Reviewed-on: http://codereview.qt.nokia.com/99
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Thomas Hartmann [Tue, 24 May 2011 16:47:33 +0000 (18:47 +0200)]
QmlDesigner: reactivating subcomponent editing
This includes refactoring the DesignDocumentController.
In the ComponentTextMoifier I use replaced because it is not blocked by
beginEditBlock() of the text cursor.
I use the same pattern now for ComponentView like for all the other
views.
The view is created and controlled by DesignModeWidget because we
have only a single instance.
Change-Id: I7809b96f52f4d275f0231f3961c3c4bc2618ce89
Reviewed-on: http://codereview.qt.nokia.com/96
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
dt [Tue, 24 May 2011 14:15:15 +0000 (16:15 +0200)]
Move QtParser to QtSupport plugin
This way we can make use of it in the cmake plugin
Change-Id: Ie1887d49ea616ec62d91a73b4daa75d69cef61c9
Reviewed-on: http://codereview.qt.nokia.com/91
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
dt [Fri, 20 May 2011 19:40:53 +0000 (21:40 +0200)]
Move a lot of qmake independent classes to a new plugin qtsupport
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.
Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Thomas Hartmann [Tue, 24 May 2011 15:24:42 +0000 (17:24 +0200)]
QmlDesigner.textToModelMerger: do not sync children of Components
Everything that is inside a Component is ignored.
Change-Id: If9fee49fbddbb7093a4275e7afd8cf9c7befba74
Reviewed-on: http://codereview.qt.nokia.com/95
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Thomas Hartmann [Tue, 24 May 2011 15:22:10 +0000 (17:22 +0200)]
QmlDesigner.tests: adding a new testfile
Change-Id: I1de64b5ddb2262a08e7a50f368a7412b11c1f60d
Reviewed-on: http://codereview.qt.nokia.com/94
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
qthjk [Tue, 24 May 2011 14:38:04 +0000 (16:38 +0200)]
debugger: fix selection of displays of integer-ish data
Change-Id: I9e9d22884a53f462b6e7a3e823cb14958c0eccd9
Reviewed-on: http://codereview.qt.nokia.com/93
Reviewed-by: hjk <qthjk@ovi.com>
Pawel Polanski [Tue, 24 May 2011 10:43:07 +0000 (12:43 +0200)]
Made some texts localizable
Change-Id: I5a70704bb89c1cf50c436557d25ded05d536662c
Reviewed-on: http://codereview.qt.nokia.com/80
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Pawel Polanski [Tue, 24 May 2011 10:40:04 +0000 (12:40 +0200)]
Publish to Ovi: Added Clean step
It is a good idea to run Clean step
for the Wizard to have a nice clean build
Change-Id: I2282c8be5e4b35f67979a786e37a53e698fbf231
Reviewed-on: http://codereview.qt.nokia.com/79
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Pawel Polanski [Tue, 24 May 2011 10:48:43 +0000 (12:48 +0200)]
Turn off notifier when reading and setting up port
Change-Id: I6f2de72d7a85626d7436f225bbbac43d9dd9816d
Reviewed-on: http://codereview.qt.nokia.com/81
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
hjk [Tue, 24 May 2011 10:38:54 +0000 (12:38 +0200)]
debugger: don't auto-continue on "stopper threads" on windows
Change-Id: Iff412524c8c7f90ff4199229ddf39e6eab8a2e4d
Reviewed-on: http://codereview.qt.nokia.com/85
Reviewed-by: hjk
hjk [Tue, 24 May 2011 10:04:24 +0000 (12:04 +0200)]
utils/environment: style
Change-Id: Ifbb9196d293205ab779294a22d0e5bd40faa887c
Reviewed-on: http://codereview.qt.nokia.com/84
Reviewed-by: hjk
hjk [Tue, 24 May 2011 09:57:26 +0000 (11:57 +0200)]
utils/environment: performance
Yes, showed up in callgrind.
Change-Id: Icb4fb9d8ed047eedf66e2e1a4bb2f24b9e217146
Reviewed-on: http://codereview.qt.nokia.com/83
Reviewed-by: hjk
hjk [Tue, 24 May 2011 09:55:09 +0000 (11:55 +0200)]
debugger: cosmetics
Change-Id: I78c9ccfa310833140fda0d6294586cc6beaf9964
Reviewed-on: http://codereview.qt.nokia.com/82
Reviewed-by: hjk
Christian Kamm [Tue, 24 May 2011 11:56:19 +0000 (13:56 +0200)]
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
Christiaan Janssen [Tue, 24 May 2011 09:40:17 +0000 (11:40 +0200)]
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>
Christian Kamm [Thu, 3 Feb 2011 14:48:14 +0000 (15:48 +0100)]
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>
dt [Fri, 20 May 2011 17:56:13 +0000 (19:56 +0200)]
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>
cerf [Tue, 24 May 2011 10:02:46 +0000 (10:02 +0000)]
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
Christian Kamm [Tue, 24 May 2011 09:50:10 +0000 (11:50 +0200)]
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>
hjk [Mon, 23 May 2011 16:54:12 +0000 (18:54 +0200)]
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
Christian Kamm [Mon, 23 May 2011 07:15:05 +0000 (09:15 +0200)]
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>
hjk [Mon, 23 May 2011 15:40:58 +0000 (17:40 +0200)]
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
Leandro Melo [Mon, 23 May 2011 14:13:50 +0000 (16:13 +0200)]
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>
Christian Hoenig [Sun, 22 May 2011 06:51:30 +0000 (08:51 +0200)]
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>
hjk [Mon, 23 May 2011 13:49:49 +0000 (15:49 +0200)]
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>
Christiaan Janssen [Mon, 23 May 2011 13:00:59 +0000 (15:00 +0200)]
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
hjk [Mon, 23 May 2011 08:58:10 +0000 (10:58 +0200)]
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
hjk [Fri, 20 May 2011 16:47:28 +0000 (18:47 +0200)]
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
hjk [Fri, 20 May 2011 14:32:05 +0000 (16:32 +0200)]
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
hjk [Fri, 20 May 2011 14:16:42 +0000 (16:16 +0200)]
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
hjk [Fri, 20 May 2011 11:36:16 +0000 (13:36 +0200)]
qmlprofiler: ui and style
Change-Id: I2153ef00f8d3c6d1cc4d39648916cad865b5a9be
Reviewed-on: http://codereview.qt.nokia.com/54
Reviewed-by: hjk
hjk [Fri, 20 May 2011 10:43:29 +0000 (12:43 +0200)]
qmlprofiler: use dockwidgets instead of tabs in the output pane
Change-Id: I2c33c4309e6568a34517fae2bb37f5e70320cfbe
Reviewed-on: http://codereview.qt.nokia.com/35
Reviewed-by: hjk
hjk [Mon, 23 May 2011 08:56:40 +0000 (10:56 +0200)]
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
Christian Kandeler [Mon, 23 May 2011 12:28:08 +0000 (14:28 +0200)]
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>
hjk [Mon, 23 May 2011 11:50:28 +0000 (13:50 +0200)]
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>
Christian Kandeler [Fri, 20 May 2011 09:17:57 +0000 (11:17 +0200)]
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>
Felix Geyer [Mon, 23 May 2011 10:29:43 +0000 (12:29 +0200)]
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
Leandro Melo [Mon, 23 May 2011 10:14:54 +0000 (12:14 +0200)]
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>
dt [Fri, 20 May 2011 17:50:28 +0000 (19:50 +0200)]
Remove unecessary include
Change-Id: I25171ca3f2d1e69be289ea6c40f5a063b3244868
Reviewed-on: http://codereview.qt.nokia.com/61
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
dt [Fri, 20 May 2011 17:48:44 +0000 (19:48 +0200)]
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>
Leena Miettinen [Fri, 20 May 2011 13:29:26 +0000 (15:29 +0200)]
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>
Friedemann Kleint [Mon, 23 May 2011 06:47:16 +0000 (08:47 +0200)]
Compile fix
Change-Id: I8f3eb7d21074fec00de870d33e493842286222ee
Reviewed-on: http://codereview.qt.nokia.com/51
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Fri, 20 May 2011 12:48:05 +0000 (14:48 +0200)]
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>
Leandro Melo [Fri, 20 May 2011 13:01:45 +0000 (15:01 +0200)]
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>
Leandro Melo [Fri, 20 May 2011 12:08:34 +0000 (14:08 +0200)]
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>
Leandro Melo [Fri, 20 May 2011 10:29:40 +0000 (12:29 +0200)]
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>
Leandro Melo [Fri, 20 May 2011 09:14:48 +0000 (11:14 +0200)]
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>