Commit Graph

19105 Commits

Author SHA1 Message Date
hjk
cdfcbcd0e0 debugger: simplify updateLocals() parameters
Change-Id: I7da344c8eeade5153fb0b98a45e139654a2119dd
Reviewed-on: http://codereview.qt.nokia.com/177
Reviewed-by: hjk <qthjk@ovi.com>
2011-05-27 11:22:53 +02:00
Christian Kamm
30fd098d9f 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>
2011-05-27 10:56:07 +02:00
Leandro Melo
8e84872ace Documentation: Code assist API
Change-Id: Id703725708823edc24171f7c1b28befe99032d63
Reviewed-on: http://codereview.qt.nokia.com/154
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-05-27 08:44:13 +02:00
Thorbjørn Lindeijer
5647e67762 QmlJSInspector: Fixed multi-selection bug
Nothing useful can be done with multi-selection at the moment, but this
bug was introduced in 8d0601515e 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>
2011-05-26 16:55:16 +02:00
Christian Kandeler
70ca0e32bb 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>
2011-05-26 16:53:16 +02:00
Christian Kandeler
64ba06e221 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>
2011-05-26 13:31:05 +02:00
Alessandro Portale
fce956895b 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>
2011-05-26 13:13:34 +02:00
Leena Miettinen
70ea664e1b Doc: fix capitalization
Change-Id: I00526a662ea6721256f7bda23d870261f4f43558
Reviewed-on: http://codereview.qt.nokia.com/147
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
2011-05-26 13:03:22 +02:00
Leandro Melo
890254b0f1 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>
2011-05-26 12:25:58 +02:00
Pawel Polanski
7e19cfd00a CODA: Coda renamed to CODA
Change-Id: I9d9ca8f576c3ecfa19fd3832d3aa685c6ac7fa89
Reviewed-on: http://codereview.qt.nokia.com/120
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
2011-05-26 12:17:57 +02:00
Pawel Polanski
536664b0c1 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>
2011-05-26 12:17:45 +02:00
Leandro Melo
be48bfb2fe 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>
2011-05-26 12:14:34 +02:00
Leandro Melo
4959f53d2c 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>
2011-05-26 12:14:24 +02:00
Thomas Hartmann
1e7c75470c 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>
2011-05-26 12:12:31 +02:00
Thomas Hartmann
8a04f4a67d 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>
2011-05-26 12:11:14 +02:00
Thomas Hartmann
4079b29f9c 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>
2011-05-26 11:44:02 +02:00
Pawel Polanski
4154f8152f 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>
2011-05-25 16:47:51 +02:00
Pawel Polanski
0d612fc565 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>
2011-05-25 16:46:35 +02:00
Pawel Polanski
ab7e8f8bbd 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>
2011-05-25 16:46:18 +02:00
Pawel Polanski
16eefb3a88 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>
2011-05-25 16:44:53 +02:00
dt_
32b457994b 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>
2011-05-25 16:24:24 +02:00
dt_
5809bc0739 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>
2011-05-25 15:45:57 +02:00
dt_
0d2313c555 Revert "Fix import of existing builds"
This reverts commit 8cd3b54949.

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>
2011-05-25 15:45:46 +02:00
Thorbjørn Lindeijer
cf88d6a812 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>
2011-05-25 14:35:20 +02:00
Leandro Melo
b9bbf24680 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>
2011-05-25 14:08:49 +02:00
Kai Koehne
c3a9436cf3 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>
2011-05-25 13:29:49 +02:00
Kai Koehne
8147973965 BuildConfiguration: Adapt name if Qt version changes
Change-Id: I1a34cb51f73af9779d6bdb07324d5dadcb5585b3
2011-05-25 13:22:55 +02:00
Leena Miettinen
28e0804767 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>
2011-05-25 12:56:47 +02:00
Christian Kamm
2569473535 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>
2011-05-25 12:07:29 +02:00
Christian Kamm
8a8b371ecc 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>
2011-05-25 11:51:05 +02:00
Thomas Hartmann
2aefea5557 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>
2011-05-25 11:28:48 +02:00
Christian Kamm
1c401481f2 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>
2011-05-25 11:04:35 +02:00
Friedemann Kleint
b8734dd727 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>
2011-05-25 10:18:59 +02:00
Thorbjørn Lindeijer
554b8e996b 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>
2011-05-25 10:14:36 +02:00
Thorbjørn Lindeijer
97ca81fc6d 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>
2011-05-25 10:12:54 +02:00
hjk
0faf7ab922 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>
2011-05-25 10:07:46 +02:00
Jarek Kobus
934a8238d4 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>
2011-05-25 09:41:35 +02:00
Thomas Hartmann
f950b8d7c7 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>
2011-05-24 18:50:25 +02:00
dt
e3842f9973 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>
2011-05-24 18:47:02 +02:00
dt
754be1bcfc 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>
2011-05-24 18:35:11 +02:00
Thomas Hartmann
dcd34febab 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>
2011-05-24 17:37:34 +02:00
Thomas Hartmann
3d417ed605 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>
2011-05-24 17:23:18 +02:00
qthjk
710b360384 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>
2011-05-24 16:40:26 +02:00
Pawel Polanski
f3faa59f1d Made some texts localizable
Change-Id: I5a70704bb89c1cf50c436557d25ded05d536662c
Reviewed-on: http://codereview.qt.nokia.com/80
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
2011-05-24 16:32:01 +02:00
Pawel Polanski
9112a090ad 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>
2011-05-24 16:31:41 +02:00
Pawel Polanski
7f9d75c2bb 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>
2011-05-24 16:18:42 +02:00
hjk
9d5a094cdf debugger: don't auto-continue on "stopper threads" on windows
Change-Id: Iff412524c8c7f90ff4199229ddf39e6eab8a2e4d
Reviewed-on: http://codereview.qt.nokia.com/85
Reviewed-by: hjk
2011-05-24 16:01:37 +02:00
hjk
c6f04ddf79 utils/environment: style
Change-Id: Ifbb9196d293205ab779294a22d0e5bd40faa887c
Reviewed-on: http://codereview.qt.nokia.com/84
Reviewed-by: hjk
2011-05-24 16:01:25 +02:00
hjk
d21645cc0d utils/environment: performance
Yes, showed up in callgrind.

Change-Id: Icb4fb9d8ed047eedf66e2e1a4bb2f24b9e217146
Reviewed-on: http://codereview.qt.nokia.com/83
Reviewed-by: hjk
2011-05-24 16:01:12 +02:00
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