OSDN Git Service

qt-creator-jp/qt-creator-jp.git
13 years agodebugger: handle results of manual break commands
hjk [Fri, 24 Jun 2011 12:17:16 +0000 (14:17 +0200)]
debugger: handle results of manual break commands

Change-Id: I0ab8ad3ef3ddfe7c8d69fd163864875190698475
Reviewed-on: http://codereview.qt.nokia.com/744
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoRemoteLinux: Fix widget appearance.
Christian Kandeler [Fri, 24 Jun 2011 16:27:59 +0000 (18:27 +0200)]
RemoteLinux: Fix widget appearance.

Change-Id: I8c6a125d07192c7ffea8c1b6c91b860299d1c33f
Reviewed-on: http://codereview.qt.nokia.com/737
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoHarmattan: Change display name for device type.
Christian Kandeler [Fri, 24 Jun 2011 16:26:26 +0000 (18:26 +0200)]
Harmattan: Change display name for device type.

Change-Id: Ifd3e504d39b2d20c72e5d551db45c33ccd82372d
Reviewed-on: http://codereview.qt.nokia.com/736
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoBuild fix
Tobias Hunger [Fri, 24 Jun 2011 15:35:53 +0000 (17:35 +0200)]
Build fix

Change-Id: I6c03d613c0dcda92ef411265e1d3d1ff679ee0a8
Reviewed-on: http://codereview.qt.nokia.com/735
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoQmlDesigner.propertyEditor: adding checkbox_tr.css
Thomas Hartmann [Fri, 24 Jun 2011 15:32:35 +0000 (17:32 +0200)]
QmlDesigner.propertyEditor: adding checkbox_tr.css

Change-Id: I10094f4cd4dae6fa3af0ea3497cbb9ed74c777f1
Reviewed-on: http://codereview.qt.nokia.com/734
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoAbi: Update to use creator-test-data repo for the abi test data
Tobias Hunger [Fri, 24 Jun 2011 10:08:29 +0000 (12:08 +0200)]
Abi: Update to use creator-test-data repo for the abi test data

Change-Id: Ie5ce3dd0d821516355bd43748f180e3323bb5879
Reviewed-on: http://codereview.qt.nokia.com/696
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoQmlDesigner.QtQuickPlugin: update for views
Thomas Hartmann [Fri, 24 Jun 2011 14:38:28 +0000 (16:38 +0200)]
QmlDesigner.QtQuickPlugin: update for views

ListView/GridView and PathView are now populated with code

Change-Id: I66356be4f4c49c11177e6aefca3f013aa0d5937c
Reviewed-on: http://codereview.qt.nokia.com/717
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.model: allow creating items from qml code in library
Thomas Hartmann [Fri, 24 Jun 2011 14:35:01 +0000 (16:35 +0200)]
QmlDesigner.model: allow creating items from qml code in library

Change-Id: I2fe7cbe594b6aac6cbf01f283a0ed0f2aec753a8
Reviewed-on: http://codereview.qt.nokia.com/720
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.symbianPlugin: update
Thomas Hartmann [Fri, 24 Jun 2011 14:30:54 +0000 (16:30 +0200)]
QmlDesigner.symbianPlugin: update

Change-Id: I7f4d5084264e4b810b3ab95fcbb51f9c9eb971f1
Reviewed-on: http://codereview.qt.nokia.com/724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.documentController: switching to master model on mode change
Thomas Hartmann [Fri, 24 Jun 2011 14:15:32 +0000 (16:15 +0200)]
QmlDesigner.documentController: switching to master model on mode change

Change-Id: If40ad93083d36eddf2090d50f2944ff7a3f77539
Reviewed-on: http://codereview.qt.nokia.com/727
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.itemLibraryInfo: add qml property for library
Thomas Hartmann [Fri, 24 Jun 2011 14:09:46 +0000 (16:09 +0200)]
QmlDesigner.itemLibraryInfo: add qml property for library

Change-Id: I986cef3a15d6332f1dcf7c0ca4cd035cc0751e76
Reviewed-on: http://codereview.qt.nokia.com/719
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.componentView: fix for captions
Thomas Hartmann [Fri, 24 Jun 2011 14:05:49 +0000 (16:05 +0200)]
QmlDesigner.componentView: fix for captions

Change-Id: I0ea2441d2989b8e395955b5e19ad45d341d12379
Reviewed-on: http://codereview.qt.nokia.com/716
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.documentController: cleanup
Thomas Hartmann [Fri, 24 Jun 2011 14:14:13 +0000 (16:14 +0200)]
QmlDesigner.documentController: cleanup

Change-Id: Ia784d21934baa83c9d8527b46b31a48be6324d2a
Reviewed-on: http://codereview.qt.nokia.com/725
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.designDocumentController: reset formeditor
Thomas Hartmann [Fri, 24 Jun 2011 14:14:57 +0000 (16:14 +0200)]
QmlDesigner.designDocumentController: reset formeditor

We are reseting now the formeditor when switching the mode.

Change-Id: Ic9d16e7587e59124dab51cd512bd6a366156c622
Reviewed-on: http://codereview.qt.nokia.com/726
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.model: add resetView() to AbstractView
Thomas Hartmann [Fri, 24 Jun 2011 14:12:20 +0000 (16:12 +0200)]
QmlDesigner.model: add resetView() to AbstractView

Change-Id: I36b14447f901ae97d24a92ce4ba0510e36177611
Reviewed-on: http://codereview.qt.nokia.com/722
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.rewriter: improve debugging
Thomas Hartmann [Fri, 24 Jun 2011 14:11:19 +0000 (16:11 +0200)]
QmlDesigner.rewriter: improve debugging

Change-Id: I62c6ba8a95ec0bdbf99b5422c5f00235d85167e3
Reviewed-on: http://codereview.qt.nokia.com/721
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.modelMerger: fix
Thomas Hartmann [Fri, 24 Jun 2011 14:09:05 +0000 (16:09 +0200)]
QmlDesigner.modelMerger: fix

The properties nodeSource and nodeSourceType also have to be copied.

Change-Id: Id583399f7e597bd03c4ad51625e88f278499555e
Reviewed-on: http://codereview.qt.nokia.com/718
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.nodeInstances: improving warnings if building qmlpuppet fails
Thomas Hartmann [Fri, 24 Jun 2011 14:05:08 +0000 (16:05 +0200)]
QmlDesigner.nodeInstances: improving warnings if building qmlpuppet fails

Change-Id: I7dfecd8e0ad0016748ef4513cf0364e8dcd7d121
Reviewed-on: http://codereview.qt.nokia.com/715
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.rewriter: crash fix
Thomas Hartmann [Fri, 24 Jun 2011 14:13:07 +0000 (16:13 +0200)]
QmlDesigner.rewriter: crash fix

This fixes a bug for UiObjectBindings.
This just did not handle the binding case properly.

Change-Id: I543a1d839d5960044b5a5a39f506af753a70c287
Reviewed-on: http://codereview.qt.nokia.com/723
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoRemove compilator's warning
Pawel Polanski [Fri, 24 Jun 2011 13:44:04 +0000 (15:44 +0200)]
Remove compilator's warning

Change-Id: I3e08eec23ae6c825f056218840d7534b66037046
Reviewed-on: http://codereview.qt.nokia.com/714
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
13 years agoBetter name for enum value.
con [Fri, 24 Jun 2011 14:00:47 +0000 (16:00 +0200)]
Better name for enum value.

Change-Id: Ic89535081fca147727d12d77e1427d8240cde6d5
Reviewed-on: http://codereview.qt.nokia.com/713
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoDon't keep canceled tasks forever.
con [Fri, 24 Jun 2011 13:47:48 +0000 (15:47 +0200)]
Don't keep canceled tasks forever.

They'll fade "after user interaction" now (since canceling will most
probably lead to mouse movement over the widget that already counts as
interaction, i.e. after pressing 'x' it will fade after a while).

Task-number: QTCREATORBUG-4456
Change-Id: Id095a6bbd5819b93ec8cb9f514b429ef5ab231e9
Reviewed-on: http://codereview.qt.nokia.com/712
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQtQuickApp wizard: Add Qt Components for Meego/Harmattan
Kai Koehne [Fri, 24 Jun 2011 11:41:05 +0000 (13:41 +0200)]
QtQuickApp wizard: Add Qt Components for Meego/Harmattan

Change-Id: I4809de36e4913037439ab9eb7c56021431cff365
Reviewed-on: http://codereview.qt.nokia.com/704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoQtQuick Wizard: Improve wording of Components page
Kai Koehne [Fri, 24 Jun 2011 11:15:55 +0000 (13:15 +0200)]
QtQuick Wizard: Improve wording of Components page

Change-Id: I02a2b4ca77a631db9ebfbf949d9a79d5a820bb4a
Reviewed-on: http://codereview.qt.nokia.com/703
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
13 years agoRevert "QtQuickApp wizard: Add option for QtQuick 1.1 module"
Kai Koehne [Fri, 24 Jun 2011 10:47:38 +0000 (12:47 +0200)]
Revert "QtQuickApp wizard: Add option for QtQuick 1.1 module"

This reverts commit 31904563bb2666c73bce71eeb7b5a166691a2b9d.
The option in the UI might actually confuse users: For the time being
we'll just keep 1.0 as the namespace.

Change-Id: Ifc7b46227d57ec8d246c8f7818d5a619ef0cd3bd
Reviewed-on: http://codereview.qt.nokia.com/699
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoQtQuickApplication wizard: Don't show Harmattan targets for symbian components
Kai Koehne [Fri, 24 Jun 2011 09:25:18 +0000 (11:25 +0200)]
QtQuickApplication wizard: Don't show Harmattan targets for symbian components

Change-Id: Ia5108c04d7898567ece7b5498359c88210ed2682
Reviewed-on: http://codereview.qt.nokia.com/695
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoSSH: set correct attributes when uploading a file.
Christian Kandeler [Fri, 24 Jun 2011 12:57:03 +0000 (14:57 +0200)]
SSH: set correct attributes when uploading a file.

Change-Id: I59484d5e66491e8941992abdd2a478364ec258a7
Reviewed-on: http://codereview.qt.nokia.com/710
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoRemove unused variables.
Christian Kandeler [Fri, 24 Jun 2011 11:19:28 +0000 (13:19 +0200)]
Remove unused variables.

Change-Id: I55ba7af5f9d4f036d3562cb1e4475809e79f8b24
Reviewed-on: http://codereview.qt.nokia.com/700
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoCODA: API has changed
Pawel Polanski [Wed, 22 Jun 2011 14:26:21 +0000 (16:26 +0200)]
CODA: API has changed

and Creator site has to be adjusted

Change-Id: If93d56bc2ad19aae985e8e861c6030950d8d846d
Reviewed-on: http://codereview.qt.nokia.com/706
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoSymbian: SIS as a format must be uppercased
Pawel Polanski [Fri, 24 Jun 2011 12:52:30 +0000 (14:52 +0200)]
Symbian: SIS as a format must be uppercased

sis as an extension should be lowercased

Change-Id: I173e76005b6775fbd1180681d6b60b8a203cc04e
Reviewed-on: http://codereview.qt.nokia.com/709
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
13 years agoPublishToOvi: Text fixes
Pawel Polanski [Fri, 24 Jun 2011 12:47:17 +0000 (14:47 +0200)]
PublishToOvi: Text fixes

Change-Id: I49ecb07ddaae02a901c8dab0b3d691d7b1589db6
Reviewed-on: http://codereview.qt.nokia.com/708
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
13 years agoTargetSetupPage: Do not show targets that do not have required features
Kai Koehne [Fri, 24 Jun 2011 09:24:33 +0000 (11:24 +0200)]
TargetSetupPage: Do not show targets that do not have required features

Change-Id: I8107f1de0120f46dd428ad257f0a38ab6ebb4abc
Reviewed-on: http://codereview.qt.nokia.com/694
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQt4BaseTargetFactory: Expose list of generic 'features' for a target
Kai Koehne [Fri, 24 Jun 2011 07:49:34 +0000 (09:49 +0200)]
Qt4BaseTargetFactory: Expose list of generic 'features' for a target

Replace the isMobileTarget, supportsShadowBuilds methods by a
generic targetFeatures method which exposes features as a set of
strings.

Change-Id: I2ac99ff5a82280316071efaa140cd7ea35b21374
Reviewed-on: http://codereview.qt.nokia.com/692
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoCODA: QtQuick component version is now displayed
Pawel Polanski [Fri, 24 Jun 2011 12:13:40 +0000 (14:13 +0200)]
CODA: QtQuick component version is now displayed

in the device's information

Change-Id: I730dfdb807a41696c81c6544f22c8b8c13bd6a72
Reviewed-on: http://codereview.qt.nokia.com/707
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
13 years agoCODA: Connect the right SIGNAL-SLOT
Pawel Polanski [Fri, 24 Jun 2011 11:31:19 +0000 (13:31 +0200)]
CODA: Connect the right SIGNAL-SLOT

Change-Id: If3193baa1530526c0b26e799e9f6f57065d419a2
Reviewed-on: http://codereview.qt.nokia.com/705
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
13 years agoRmoteLinux: Fix variable usage.
Christian Kandeler [Fri, 24 Jun 2011 11:23:58 +0000 (13:23 +0200)]
RmoteLinux: Fix variable usage.

Change-Id: I89dff1adde47393bd1b9f05bbe23698bcd04eab0
Reviewed-on: http://codereview.qt.nokia.com/701
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoFix gcc warning.
Christian Kandeler [Fri, 24 Jun 2011 11:42:19 +0000 (13:42 +0200)]
Fix gcc warning.

Change-Id: I42dee44f1cee68d83d803174f477b79131a7e109
Reviewed-on: http://codereview.qt.nokia.com/702
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoSymbian: New system version descriptions added
Pawel Polanski [Wed, 22 Jun 2011 14:24:20 +0000 (16:24 +0200)]
Symbian: New system version descriptions added

Change-Id: I6eaac635c27ee4dc04bedc96a3a70117bd3fd773
Reviewed-on: http://codereview.qt.nokia.com/630
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
13 years agoGeneric Project Wizard: Fix Icon of root item in edit files
dt_ [Fri, 24 Jun 2011 10:42:59 +0000 (12:42 +0200)]
Generic Project Wizard: Fix Icon of root item in edit files

Change-Id: I4d42bca662207ad9f8ee8db55d88f4618b1ccc2d
Reviewed-on: http://codereview.qt.nokia.com/697
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQmlJS: Fix error location for prototype errors.
Christian Kamm [Fri, 24 Jun 2011 07:55:14 +0000 (09:55 +0200)]
QmlJS: Fix error location for prototype errors.

Change-Id: Iaeb96ff67cfc92bcddeb1b7075b7fdcbaed317c0
Reviewed-on: http://codereview.qt.nokia.com/691
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoCodeAssist: Relax a bit premature match
Leandro Melo [Thu, 23 Jun 2011 13:35:07 +0000 (15:35 +0200)]
CodeAssist: Relax a bit premature match

In a relatively recent commit (99fee33fd1a5e82b7be3d17a74229efaaf7571ef)
premature match was setup to work only on explicit invocations. However
this has shown to be too strict. Therefore, it's now a bit relaxed (not
as much as before): If the current item ends with the typed character we
assume  this is intenional - general premature matches do not end with
identifier characters anyway.

Note: Leaving only the last character as the condition is not an option
since sometimes they are not shown in the proposal description.

This patch also lifts the text method to IAssistProposalItem since
it's reasonable the every proposal must have at least some description.

Change-Id: I2ef7de2b7f978ce7059cce50175137a03315f495
Reviewed-on: http://codereview.qt.nokia.com/675
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
13 years agoCodeAssist: Expand prefix only when it's a completion
Leandro Melo [Thu, 23 Jun 2011 13:04:01 +0000 (15:04 +0200)]
CodeAssist: Expand prefix only when it's a completion

Quickfixes, for instance, should not be expanded.

Change-Id: I832ea11c5a270ee290441aca0d2c7231d0ced013
Reviewed-on: http://codereview.qt.nokia.com/674
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
13 years agoQmlJS: Manually fix location qmltypes.
Christian Kamm [Fri, 24 Jun 2011 07:10:46 +0000 (09:10 +0200)]
QmlJS: Manually fix location qmltypes.

The new location plugin does not export some of the 1.1 types anymore.
I've manually added the missing exports.

Change-Id: I19886a40fa61ab01f21b581fee315619f98668fd
Reviewed-on: http://codereview.qt.nokia.com/689
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoRemote Linux: Get rid of indirection when setting up deployables.
Christian Kandeler [Fri, 24 Jun 2011 07:25:13 +0000 (09:25 +0200)]
Remote Linux: Get rid of indirection when setting up deployables.

It might have been useful at some point, but certainly isn't now.

Change-Id: Ibb5d2d1133a6022617336be78f1ff23a3d734a2f
Reviewed-on: http://codereview.qt.nokia.com/690
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoQmlJS: Add 'reset code model' action.
Christian Kamm [Thu, 23 Jun 2011 13:12:03 +0000 (15:12 +0200)]
QmlJS: Add 'reset code model' action.

Having to restart Creator should be a thing of the past.

Task-number: QTCREATORBUG-4813
Change-Id: Ide242ee299b5d34aecba4823032e27741dde4a86
Reviewed-on: http://codereview.qt.nokia.com/668
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoMerge branch '2.2'
Oswald Buddenhagen [Thu, 23 Jun 2011 17:46:43 +0000 (19:46 +0200)]
Merge branch '2.2'

Conflicts:
qtcreator.pri
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.cpp
src/libs/qmljs/qmljsdocument.cpp
src/libs/qmljs/qmljsinterpreter.cpp
src/libs/qmljs/qmljsinterpreter.h
src/libs/qmljs/qmljslink.cpp
src/plugins/cppeditor/cppquickfixes.cpp
src/plugins/qmldesigner/extrasplugin/extrasplugin.cpp
src/plugins/qmldesigner/qmldesigner.pro
src/plugins/qmldesigner/symbianplugin/symbian.metainfo
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.h

Change-Id: Id5f754e2837a3bb3e0687ed09f1dda45fd0c5617

13 years agoRevert "BuildstepConfigWidgets can be set expanded by default"
Oswald Buddenhagen [Wed, 22 Jun 2011 10:19:11 +0000 (12:19 +0200)]
Revert "BuildstepConfigWidgets can be set expanded by default"

This reverts commit deae00a12e197943a69dd980c401b9cbdb3baba4 for master.

13 years agoRevert "Qt4ProjectManager exports for RemoteCompiler"
Oswald Buddenhagen [Wed, 22 Jun 2011 10:18:55 +0000 (12:18 +0200)]
Revert "Qt4ProjectManager exports for RemoteCompiler"

This reverts commit 66b415f90387e7edb13a9bc6a1bddd98780e19b5 for master.

13 years agoRevert "Custom targets can set QtVersion to support id and set abis"
Oswald Buddenhagen [Wed, 22 Jun 2011 10:18:19 +0000 (12:18 +0200)]
Revert "Custom targets can set QtVersion to support id and set abis"

This reverts commit 462278b0710316819372571fbcf40c62088302d4 for master.

13 years agoGlobal regexp search would eat all memory for matched empty lines.
con [Thu, 23 Jun 2011 14:53:06 +0000 (16:53 +0200)]
Global regexp search would eat all memory for matched empty lines.

E.g. for '^$'. also for '.*'

Task-number: QTCREATORBUG-4443
Change-Id: Ic164361ccdf791c2d0ec3c6ec501e34c9ec3fda6
Reviewed-on: http://codereview.qt.nokia.com/681
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoRemoteLinux: Move current device configuration to deploy configuration.
Christian Kandeler [Thu, 23 Jun 2011 10:50:54 +0000 (12:50 +0200)]
RemoteLinux: Move current device configuration to deploy configuration.

It used to be in the deploy steps itself, which is theoretically
more flexible, but offers no advantage in practice and also causes
a lot of hassle.

Change-Id: I0eafaf8477067fced86b7a05fd94d72a35e02bb7
Reviewed-on: http://codereview.qt.nokia.com/654
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoDebugger[CDB]: Do not detach on shutdown in case of console.
Friedemann Kleint [Thu, 23 Jun 2011 14:43:30 +0000 (16:43 +0200)]
Debugger[CDB]: Do not detach on shutdown in case of console.

Do not use effectiveStartMode in shutdown.

Change-Id: Ia300f511f335de4a7d9d7c07e2080cecc91042e4
Reviewed-on: http://codereview.qt.nokia.com/680
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoRemove some aggregation deadlocks.
con [Thu, 23 Jun 2011 14:20:38 +0000 (16:20 +0200)]
Remove some aggregation deadlocks.

You are not allowed to add components that belong to other aggregate
(including aggregates themselves). Warn in this case instead of locking
up.

Task-number: QTCREATORBUG-4926
Change-Id: I4908fb9019efbc2fa3b7c3c57e08cc1d7f8f3e2c
Reviewed-on: http://codereview.qt.nokia.com/679
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
13 years agoFind/replace tool bar wasn't usable in very small width editors.
con [Thu, 23 Jun 2011 12:35:45 +0000 (14:35 +0200)]
Find/replace tool bar wasn't usable in very small width editors.

E.g. in split editors with small main window. We now have line edits
with a minimum size and use a flow layout for the replace buttons (which
will reduce width when necessary by laying out vertically).

Flow layout is taken from the Qt examples.

Task-number: QTCREATORBUG-3279
Change-Id: Ic07d4d3e75e3d928d6b53534adb42481ce26256b
Reviewed-on: http://codereview.qt.nokia.com/666
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoQmlProfiler: Callers and Callees separate views
Christiaan Janssen [Wed, 22 Jun 2011 15:58:58 +0000 (17:58 +0200)]
QmlProfiler: Callers and Callees separate views

Change-Id: Ifa3939eeda2a473722cbd8dfac33794a15d8c453
Reviewed-on: http://codereview.qt.nokia.com/678
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoRemote Linux: Fix possible crash.
Christian Kandeler [Thu, 23 Jun 2011 14:13:42 +0000 (16:13 +0200)]
Remote Linux: Fix possible crash.

Change-Id: I1519117381dbeb22d40546ecf8467079ca85aa35
Reviewed-on: http://codereview.qt.nokia.com/677
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoHarmattan: Create empty Aegis manifest file on target creation.
Christian Kandeler [Thu, 23 Jun 2011 13:31:42 +0000 (15:31 +0200)]
Harmattan: Create empty Aegis manifest file on target creation.

This way, the developer gets a hint about what to edit when
it becomes necessary to manually set capabilities.

Change-Id: I03ef476b87cba26fd15d1bc28ba652d4114578b6
Reviewed-on: http://codereview.qt.nokia.com/676
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoQmlProfiler: Dependencies view
Christiaan Janssen [Wed, 22 Jun 2011 13:02:33 +0000 (15:02 +0200)]
QmlProfiler: Dependencies view

Change-Id: I1172d66b8e577994df787e2bb14cdd03a2affb35
Reviewed-on: http://codereview.qt.nokia.com/613
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQt4Project: Reset QML import paths in ProjectInfo.
Christian Kamm [Thu, 23 Jun 2011 13:09:38 +0000 (15:09 +0200)]
Qt4Project: Reset QML import paths in ProjectInfo.

Previously, import paths would accumulate.

Change-Id: I2f6f12abde7906fc823323e4470af7a19afa304e
Reviewed-on: http://codereview.qt.nokia.com/667
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQtQuickApp wizard: Add option for QtQuick 1.1 module
Kai Koehne [Wed, 22 Jun 2011 14:21:59 +0000 (16:21 +0200)]
QtQuickApp wizard: Add option for QtQuick 1.1 module

Technically it's just one line in the generated file, but might
avoid people be confused on why there is only QtQuick 1.0 as an option.

Change-Id: I61fb4e82d8ee71fe6fddcd6845b4b48e78004e81
Reviewed-on: http://codereview.qt.nokia.com/625
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoQmlJS: Respect the REVISION property for methods and properties.
Christian Kamm [Thu, 23 Jun 2011 11:32:00 +0000 (13:32 +0200)]
QmlJS: Respect the REVISION property for methods and properties.

Task-number: QTCREATORBUG-3907
Change-Id: Ic2c1f8cafe381e5216ae7ad73502ca0fae20dda0
Reviewed-on: http://codereview.qt.nokia.com/656
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoRemoteLinux: Fix possible crash.
Christian Kandeler [Thu, 23 Jun 2011 10:28:57 +0000 (12:28 +0200)]
RemoteLinux: Fix possible crash.

We cannot assume that a deploy configuration is present.

Change-Id: I396f630d2ad01f2b17d65c41ad4b2ec587b7e48d
Reviewed-on: http://codereview.qt.nokia.com/653
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agodebugger: update our gdb patches
hjk [Thu, 23 Jun 2011 10:36:25 +0000 (12:36 +0200)]
debugger: update our gdb patches

Change-Id: I1c81b28ab22ec11dcef1f58030b5906f4fc6323c
Reviewed-on: http://codereview.qt.nokia.com/652
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: correct comment in dumper.py
hjk [Thu, 23 Jun 2011 09:48:37 +0000 (11:48 +0200)]
debugger: correct comment in dumper.py

Change-Id: Ic1d33180515ad79c4233b013ec7d3530674d5117
Reviewed-on: http://codereview.qt.nokia.com/651
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: remove listing of breakpoints in dumper code
hjk [Thu, 23 Jun 2011 09:28:15 +0000 (11:28 +0200)]
debugger: remove listing of breakpoints in dumper code

This was meant to provide breakpoint notifications which are available
in gdb 7.3.50.x now.

Change-Id: I09ced542bb5171f10350b9dc722cab3376d1ded8
Reviewed-on: http://codereview.qt.nokia.com/650
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoQmlJS: Fix completion inside grouped propery bindings.
Christian Kamm [Thu, 23 Jun 2011 08:25:43 +0000 (10:25 +0200)]
QmlJS: Fix completion inside grouped propery bindings.

Task-number: QTCREATORBUG-3541
Change-Id: Ida8e59b65836c8515fbfbd2a9e4737d9ae04e76c
Reviewed-on: http://codereview.qt.nokia.com/639
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoFix warning about || and && usage
Tobias Hunger [Thu, 23 Jun 2011 09:22:59 +0000 (11:22 +0200)]
Fix warning about || and && usage

Change-Id: Ibdacd1ae51b2203c66030a2191cb3eadc41f630a
Reviewed-on: http://codereview.qt.nokia.com/648
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoAbi: Fix detection of ELF files on big endian machines
Tobias Hunger [Thu, 23 Jun 2011 09:21:50 +0000 (11:21 +0200)]
Abi: Fix detection of ELF files on big endian machines

Change-Id: I1301e463fc97fa9615398a2a120874c809975ae5
Reviewed-on: http://codereview.qt.nokia.com/647
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoqmldump: Use binary that's shipped with Qt if available.
Christian Kamm [Tue, 21 Jun 2011 12:03:14 +0000 (14:03 +0200)]
qmldump: Use binary that's shipped with Qt if available.

Change-Id: Ia36dcc2596fbe6aef5014d03ed0303d3087ecc0b
Reviewed-on: http://codereview.qt.nokia.com/547
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlJS: Fix completion of 'anchors.'.
Christian Kamm [Wed, 22 Jun 2011 15:18:06 +0000 (17:18 +0200)]
QmlJS: Fix completion of 'anchors.'.

The hasChildInPackage function was broken, so we completed 'anchors:'
instead.

Task-number: QTCREATORBUG-5180
Change-Id: I0e0d68aec3cf4e5bea991e39169beecf541ce477
Reviewed-on: http://codereview.qt.nokia.com/643
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoQmlJS: Always generate a onXyzChanged slot.
Christian Kamm [Thu, 23 Jun 2011 07:10:32 +0000 (09:10 +0200)]
QmlJS: Always generate a onXyzChanged slot.

Even if the NOTIFY signal listed for the property has a different name.

Task-number: QTCREATORBUG-3614
Change-Id: I748cddab89732acd6a56b243610be52873225064
Reviewed-on: http://codereview.qt.nokia.com/637
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoqmldump: Fix for extended objects.
Christian Kamm [Wed, 22 Jun 2011 15:17:06 +0000 (17:17 +0200)]
qmldump: Fix for extended objects.

Before, extended objects had the same exports as the base object
which lead to trouble.

Change-Id: Id40f0e0fd2211db95020ce224cf2c52939e68df7
Reviewed-on: http://codereview.qt.nokia.com/642
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoBuild fix
Tobias Hunger [Thu, 23 Jun 2011 08:58:20 +0000 (10:58 +0200)]
Build fix

Change-Id: I38ed5c003fe24ef376c4043a8b4ce17f7848d7bd
Reviewed-on: http://codereview.qt.nokia.com/646
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agovcsbase: auto save settings when requested by Core::ICore
cerf [Thu, 23 Jun 2011 08:32:37 +0000 (10:32 +0200)]
vcsbase: auto save settings when requested by Core::ICore

Bazaar and Mercurial plugins are impacted

Change-Id: Ia781dae79983350d773f454de32f812e876bfbfb
Merge-request: 350
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/645
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoDoc: add Nokia N9 and update Harmattan info
Leena Miettinen [Wed, 22 Jun 2011 15:25:48 +0000 (17:25 +0200)]
Doc: add Nokia N9 and update Harmattan info

Change-Id: I5c1b88b18571530c5663bbecc2d4edd17d733dea
Reviewed-by: Christian Kandeler
Reviewed-on: http://codereview.qt.nokia.com/641
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoDoc: add version numbers to the doc titles
Leena Miettinen [Wed, 22 Jun 2011 15:24:57 +0000 (17:24 +0200)]
Doc: add version numbers to the doc titles

Change-Id: I2b71cba2ab19a15a834976e3ce953e992ca4b124
Reviewed-by: David Boddie
Reviewed-on: http://codereview.qt.nokia.com/640
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoQmlJS: Don't try to complete slots in lhs of binding.
Christian Kamm [Wed, 22 Jun 2011 14:26:35 +0000 (16:26 +0200)]
QmlJS: Don't try to complete slots in lhs of binding.

Task-number: QTCREATORBUG-3459
Change-Id: I694391bf7ccddcaa539ec4ed2b744e875cc43f38
Reviewed-on: http://codereview.qt.nokia.com/626
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoQmlDesigner.NodeInstances: Move qmlpuppet to share
Marco Bubke [Wed, 22 Jun 2011 16:17:06 +0000 (18:17 +0200)]
QmlDesigner.NodeInstances: Move qmlpuppet to share

Change-Id: Id50d8c6130e9d5169a74015bc24e84de64eabfa7
Reviewed-on: http://codereview.qt.nokia.com/634
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQtQuickApp wizard: Use qsTr() for string
Kai Koehne [Wed, 22 Jun 2011 14:01:02 +0000 (16:01 +0200)]
QtQuickApp wizard: Use qsTr() for string

Change-Id: Ie2f40065c000b5bf588a0cd5470ec42091080c97
Reviewed-on: http://codereview.qt.nokia.com/621
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoOn new generic project, show progress and dialog
dt_ [Tue, 21 Jun 2011 15:12:44 +0000 (17:12 +0200)]
On new generic project, show progress and dialog

Task-Nr: QTCREATORBUG-2226

Change-Id: I62e1c740a008663396960cfc12a05202f8800892
Reviewed-on: http://codereview.qt.nokia.com/594
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
13 years agodebugger: add some instructions to two manual tests
hjk [Wed, 22 Jun 2011 15:51:59 +0000 (17:51 +0200)]
debugger: add some instructions to two manual tests

Change-Id: If90fb6348f3431c79552747a572c28cdc68557bf
Reviewed-on: http://codereview.qt.nokia.com/633
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: fix gcc 4.4's std::map display
hjk [Wed, 22 Jun 2011 15:49:33 +0000 (17:49 +0200)]
debugger: fix gcc 4.4's std::map display

Was mentioned at

http://www.qtcentre.org/threads/41700-How-to-watch-STL-containers-iterators-during-debugging.

gcc 4.4 does not encode the allocator type properly so it can't be used
to extract the 'pair type' in the dumper.

Change-Id: I2cb09ce59865a87dc954fce433aef4826111a95a
Reviewed-on: http://codereview.qt.nokia.com/632
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: disable 'target async' in the ui
hjk [Wed, 22 Jun 2011 15:14:08 +0000 (17:14 +0200)]
debugger: disable 'target async' in the ui

No real benefits so far.

Task-number: QTCREATORBUG-4682
Change-Id: Ibb416fed09e4e0210a84a51b2cd71189ac01ffa6
Reviewed-on: http://codereview.qt.nokia.com/631
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: add manual test for QTCREATORBUG-5046
hjk [Wed, 22 Jun 2011 15:01:59 +0000 (17:01 +0200)]
debugger: add manual test for QTCREATORBUG-5046

Task-number: QTCREATORBUG-5046
Change-Id: I1b823b6c46ecff81db56e961565a120b8f6b58b6
Reviewed-on: http://codereview.qt.nokia.com/629
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: add test for QTCREATORBUG-4904
hjk [Wed, 22 Jun 2011 12:57:20 +0000 (14:57 +0200)]
debugger: add test for QTCREATORBUG-4904

Task-number: QTCREATORBUG-4904
Change-Id: I3ddd95fe713270f44c5a9698e08864d5c8279452
Reviewed-on: http://codereview.qt.nokia.com/628
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoRemoteLinux: Compile fix.
Christian Kandeler [Wed, 22 Jun 2011 14:17:27 +0000 (16:17 +0200)]
RemoteLinux: Compile fix.

Change-Id: I34ab895ae35736f6514cc0812751fa2f6d56c2c4
Reviewed-on: http://codereview.qt.nokia.com/622
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoRegister action for clear output pane.
con [Wed, 22 Jun 2011 13:41:18 +0000 (15:41 +0200)]
Register action for clear output pane.

Change-Id: Ib148d37a92dcaa2da9def7895ced6ede8ed1d0a3
Reviewed-on: http://codereview.qt.nokia.com/620
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoCompletion: Respect explicit invocation (always)
Leandro Melo [Tue, 21 Jun 2011 15:23:16 +0000 (17:23 +0200)]
Completion: Respect explicit invocation (always)

Even if the completion popup is already visible is should
respect the behavior expected for explicit invocation.

Change-Id: Ib4635fead060b90f677bfd7b2751a20c030f67a1
Reviewed-on: http://codereview.qt.nokia.com/571
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
13 years agoCompletion: Restrict prefix and implicit mode
Leandro Melo [Tue, 21 Jun 2011 14:54:43 +0000 (16:54 +0200)]
Completion: Restrict prefix and implicit mode

Automatic prefix and implicit completion should only
happen when the setting allows, the popup is synchronized,
and the completion has just been invoked. This means that
if characters are typed afterwards they should not trigger
such behavior.

Change-Id: Iedfc4211d171a21ef0a2daaa475d291e756e7cc0
Reviewed-on: http://codereview.qt.nokia.com/570
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
13 years agoCompletion: Fine tuning perfect match behavior
Leandro Melo [Tue, 21 Jun 2011 13:11:16 +0000 (15:11 +0200)]
Completion: Fine tuning perfect match behavior

Keeping or not the completion popup upon a perfect match
is best identified by the model in question instead of simply
by the triggering reason. For instance, in QML we don't want
to preserve the popup if completion was triggered by an
activation sequence. On the other hand, this is ok for C++
since a semicolon or parenthesis will in general still be
typed (in some cases even with the intention to take advantage
of the automatic bracked insertion).

For more context see 271bd44d2c1daa43c125cc09e6af57bb756de857.

Change-Id: If9dbf33243b623c077ce027e7e46265d0fc4ba8b
Reviewed-on: http://codereview.qt.nokia.com/563
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
13 years agoMobileAppWizard: Code beautification
Kai Koehne [Wed, 22 Jun 2011 12:58:11 +0000 (14:58 +0200)]
MobileAppWizard: Code beautification

Change-Id: If81cb01dba64a205a6143fa24882a64ef8041137
Reviewed-on: http://codereview.qt.nokia.com/612
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQt Quick Components Wizard
Feetu Nyrhinen [Fri, 10 Jun 2011 12:40:57 +0000 (15:40 +0300)]
Qt Quick Components Wizard

Selection of Qt Quick component set
and use of specific QML template files (Qt Quick 1.0 and
com.nokia.symbian 1.0) based on the user selections.

Change-Id: I93cfa8735dcf285c76ff04a6186a4eca1f90a361
Reviewed-on: http://codereview.qt.nokia.com/567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoSmall refactor, preparation for built-in settings
Jarek Kobus [Wed, 22 Jun 2011 13:04:24 +0000 (15:04 +0200)]
Small refactor, preparation for built-in settings

Change-Id: I91de7a01aba37f41398df7b06dbe5af868094379
Reviewed-on: http://codereview.qt.nokia.com/615
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
13 years agoFix double message introduced for killed applications
dt_ [Wed, 22 Jun 2011 12:12:49 +0000 (14:12 +0200)]
Fix double message introduced for killed applications

Introduced in ef806894e87614173c06d50f22dc5b00cf9bc3e9

Change-Id: Ia1c3ac7b8a01ae247cf13417e42abf3376253274
Task-Nr: QTCREATORBUG-5190
Reviewed-on: http://codereview.qt.nokia.com/611
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoQmlDesigner.nodeInstances: use a Qt qmlpuppet if present
Thomas Hartmann [Thu, 9 Jun 2011 16:16:40 +0000 (18:16 +0200)]
QmlDesigner.nodeInstances: use a Qt qmlpuppet if present

Use a Qt qmlpuppet if present, otherwise fallack to the
puppet provided by Qt Creator.

We look into bin/qmlpuppet(.app/.exe)

Change-Id: I057e9ce7cbcc6f3e9926eef482f7f2a34d902aa3
Reviewed-on: http://codereview.qt.nokia.com/441
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
13 years agodebugger: update manual tests
hjk [Wed, 22 Jun 2011 11:16:29 +0000 (13:16 +0200)]
debugger: update manual tests

Task-number: QTCREATORBUG-5184, QTCREATORBUG-5106
Change-Id: Icc43f534755f897eeea5333186b84fec91dbb8c0
Reviewed-on: http://codereview.qt.nokia.com/606
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoQmlDesigner.NodeInstances: Fix installation
Marco Bubke [Wed, 22 Jun 2011 11:39:32 +0000 (13:39 +0200)]
QmlDesigner.NodeInstances: Fix installation

Change-Id: I79f150fc6610d87dc71f98dde93eea60be6b8b4e
Reviewed-on: http://codereview.qt.nokia.com/602
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoback out whitespace cleanups after autosave
Oswald Buddenhagen [Mon, 20 Jun 2011 16:32:06 +0000 (18:32 +0200)]
back out whitespace cleanups after autosave

otherwise the editing flow is disturbed

Change-Id: I1ae74ab192b19ac8ea0b77b803c797afcd29e7c7
Reviewed-on: http://codereview.qt.nokia.com/564
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoRemoteLinux: Don't query an incompletely parsed project node.
Christian Kandeler [Wed, 22 Jun 2011 11:28:33 +0000 (13:28 +0200)]
RemoteLinux: Don't query an incompletely parsed project node.

Change-Id: I6a5e35afea0d5b358ec9921f1acb129484139a52
Reviewed-on: http://codereview.qt.nokia.com/601
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoFix proFileUpdated signal, set correct parse in progress state
dt_ [Wed, 22 Jun 2011 10:53:49 +0000 (12:53 +0200)]
Fix proFileUpdated signal, set correct parse in progress state

Change-Id: I1f7ca269115491323373fe5c4230bd38860c08ce
Reviewed-on: http://codereview.qt.nokia.com/596
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>