OSDN Git Service

qt-creator-jp/qt-creator-jp.git
13 years agoQmlProfiler: Track status of app through application output
Kai Koehne [Thu, 9 Jun 2011 12:30:15 +0000 (14:30 +0200)]
QmlProfiler: Track status of app through application output

We do that already in the debugger too.

Change-Id: I31828a01aaec041ac38102b9bd034728d02486e2
Reviewed-on: http://codereview.qt.nokia.com/427
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoExport S60DeployConfiguration class
Kai Koehne [Thu, 9 Jun 2011 10:52:38 +0000 (12:52 +0200)]
Export S60DeployConfiguration class

Allow the class to be used in QmlProfiler

Change-Id: I11e5bad9a836a0589f1cded431844c9cd8185e22
Reviewed-on: http://codereview.qt.nokia.com/426
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
13 years agoExport S60DeviceRunConfiguration class
Kai Koehne [Thu, 9 Jun 2011 10:39:39 +0000 (12:39 +0200)]
Export S60DeviceRunConfiguration class

Allow class to be used in QmlProfiler. The patch moves
S60DeviceDebugRunControl(Factory) classes into their own files. Also,
make qt4Target(), qtVersion() protected and use the generic target()
method instead outside of the class.

Change-Id: I29e7609cf75d54e186fe2b9d66f52241f4fb4948
Reviewed-on: http://codereview.qt.nokia.com/425
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
13 years agoExport CodaRunControl class
Kai Koehne [Thu, 9 Jun 2011 10:19:38 +0000 (12:19 +0200)]
Export CodaRunControl class

Allow class to be used in qmlprofiler plugin.

Change-Id: I2bf055c287254ba4d541879d8c8ebc27fdd8887b
Reviewed-on: http://codereview.qt.nokia.com/424
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
13 years agovcsbase: auto load/save settings in EditorParameterWidget
cerf [Fri, 10 Jun 2011 08:40:42 +0000 (10:40 +0200)]
vcsbase: auto load/save settings in EditorParameterWidget

Change-Id: If99006d418d8e3878677518a1bc0997bdfef38c6
Merge-request: 341
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/444
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoTasks: Only report warning tasks in build progress
Tobias Hunger [Tue, 7 Jun 2011 15:53:46 +0000 (17:53 +0200)]
Tasks: Only report warning tasks in build progress

Task-number: QTCREATORBUG-5020
Change-Id: Iead3d76509dd7b6d6c04d0ef64b7b3d2cad316d0
Reviewed-on: http://codereview.qt.nokia.com/369
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoCodepaster: Fix warning about hidden virtuals
Tobias Hunger [Sat, 4 Jun 2011 19:16:13 +0000 (21:16 +0200)]
Codepaster: Fix warning about hidden virtuals

Change-Id: Id4838e20b4a62d31bf3d739836011e9bcfa2e335
Reviewed-on: http://codereview.qt.nokia.com/353
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoWizards: Do not allow ~,! in file names.
Friedemann Kleint [Fri, 10 Jun 2011 07:36:55 +0000 (09:36 +0200)]
Wizards: Do not allow ~,! in file names.

Task-number: QTCREATORBUG-5063

Change-Id: Ide80c5e52a867c45d8feb9109c65328bdda0f86c
Reviewed-on: http://codereview.qt.nokia.com/443
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoFix first rename after creating a new project
dt_ [Thu, 9 Jun 2011 15:43:41 +0000 (17:43 +0200)]
Fix first rename after creating a new project

Change-Id: Iec997ba24a11a5035d3f70ce5818d44142f3c5a6
Task-Nr: QTCREATORBUG-5116
Reviewed-on: http://codereview.qt.nokia.com/440
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQmlDesigner.nodeInstanceView: adding parameter pathToQt
Thomas Hartmann [Thu, 9 Jun 2011 14:53:56 +0000 (16:53 +0200)]
QmlDesigner.nodeInstanceView: adding parameter pathToQt

The NodeInstanceView is now informed about the build pathToQt.

Change-Id: I728c9c356354ccf73599950c1c0bf4a96bd0a628
Reviewed-on: http://codereview.qt.nokia.com/437
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
13 years agoQmlDesigner.documentController: keep track of the current Qt Version
Thomas Hartmann [Thu, 9 Jun 2011 14:33:57 +0000 (16:33 +0200)]
QmlDesigner.documentController: keep track of the current Qt Version

Keeping track of the Qt Version and its binary path

Change-Id: I885880dd6ad45ea1fab7785cb043da1abd5aded3
Reviewed-on: http://codereview.qt.nokia.com/418
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlDesigner.formEditor: crash fix
Thomas Hartmann [Thu, 9 Jun 2011 14:55:46 +0000 (16:55 +0200)]
QmlDesigner.formEditor: crash fix

I had a crash here, because the qmlItemNode was invalid.

Change-Id: Ib6d8bbde7acf7e5f6a0fb56bf496c41df29f7142
Reviewed-on: http://codereview.qt.nokia.com/438
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
13 years agoQmlDesigner.nodeInstances: on windows executables end with exe
Thomas Hartmann [Thu, 9 Jun 2011 14:50:17 +0000 (16:50 +0200)]
QmlDesigner.nodeInstances: on windows executables end with exe

On Windows executables have the suffix ".exe"
I also enclosed the strings with QLatin1String

Change-Id: Idf7a16ca6e0370f091225aaea7137418d8563aaf
Reviewed-on: http://codereview.qt.nokia.com/436
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
13 years agoRenaming files: fix case-change only renames
dt_ [Thu, 9 Jun 2011 14:31:42 +0000 (16:31 +0200)]
Renaming files: fix case-change only renames

Change-Id: Ie95133d22de33a0acca7756b8a41b3812e7dd9e7
Task-Nr: QTCREATORBUG-2434
Reviewed-on: http://codereview.qt.nokia.com/435
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoQmlProfiler: disabled FPS display (for now)
Christiaan Janssen [Thu, 9 Jun 2011 14:14:49 +0000 (16:14 +0200)]
QmlProfiler: disabled FPS display (for now)

Change-Id: Ib35d3833e7d360b924ecaaaf46ae5c65f3bd7b8e
Reviewed-by: Kai Koehne
Reviewed-on: http://codereview.qt.nokia.com/434
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlDesigner.NodeInstances: Support for Qt five scene graph
Marco Bubke [Thu, 9 Jun 2011 13:50:48 +0000 (15:50 +0200)]
QmlDesigner.NodeInstances: Support for Qt five scene graph

QmlPuppet only supported GraphicsView. There is now Qml2Puppet which is
supporting the new Qt Scene Graph.

Change-Id: Ia0a06639cf6852192e84f7bfc2bea60532890b08
Reviewed-on: http://codereview.qt.nokia.com/433
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlProfiler: removed scrollbar, timeline stretches automatically
Christiaan Janssen [Thu, 9 Jun 2011 12:54:56 +0000 (14:54 +0200)]
QmlProfiler: removed scrollbar, timeline stretches automatically

Change-Id: Ibc012d517556914e61ccbf58245a6d83cb4c8a80
Reviewed-by: Kai Koehne
Reviewed-on: http://codereview.qt.nokia.com/429
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlProfiler: renamed "Summary" tab to "Bindings"
Christiaan Janssen [Thu, 9 Jun 2011 12:56:18 +0000 (14:56 +0200)]
QmlProfiler: renamed "Summary" tab to "Bindings"

Change-Id: Ib6341937847cc784078f499dd0040456bd60efee
Reviewed-by: Kai Koehne
Reviewed-on: http://codereview.qt.nokia.com/430
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years ago* External Tools: Added shortcut for menu entry
Orgad Shaneh [Thu, 9 Jun 2011 12:41:58 +0000 (14:41 +0200)]
* External Tools: Added shortcut for menu entry

Merge-request: 342
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: Ib765053e69f3917356ad30d70306165cfa19effa

13 years agoQmlProfiler: renamed from "Perfomance Monitor" to "Profiler"
Christiaan Janssen [Thu, 9 Jun 2011 12:27:32 +0000 (14:27 +0200)]
QmlProfiler: renamed from "Perfomance Monitor" to "Profiler"

Change-Id: I00e051f810fb147775c925f0e2378a46d660967e
Reviewed-on: http://codereview.qt.nokia.com/423
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoProgressView: Also replace old tasks that are canceling
dt_ [Thu, 9 Jun 2011 11:18:39 +0000 (13:18 +0200)]
ProgressView: Also replace old tasks that are canceling

Those tasks might not have finished yet, so there's a small race when
canceling and restarting a task.

Change-Id: I9f9ffcc6869455e7d8a407ff6ff4c40518d60f27
Task-Nr: QTCREATORBUG-4801
Reviewed-on: http://codereview.qt.nokia.com/419
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQmlDesigner.componentView: cleaning up
Thomas Hartmann [Thu, 9 Jun 2011 09:34:13 +0000 (11:34 +0200)]
QmlDesigner.componentView: cleaning up

There was some dead code I removed.
I also refactored the node removal and made it more robust.

Change-Id: I3bd566011302968c1d798689fcca3b4a3880b306
Reviewed-on: http://codereview.qt.nokia.com/417
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.componentView: update and bug fixing
Thomas Hartmann [Thu, 9 Jun 2011 08:53:22 +0000 (10:53 +0200)]
QmlDesigner.componentView: update and bug fixing

I implemented nodeReparented() (bugfix)
I use ModelNode::ComponentSource instead of childNode.type() == "QtQuick.Component"
to catch "implicit" components.

Change-Id: Ie5bd48afbb5a5b10c3544406b1229aafc5dabed5
Reviewed-on: http://codereview.qt.nokia.com/416
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoAdded constant values for enumerators in their tooltips.
Erik Verbruggen [Thu, 9 Jun 2011 07:30:32 +0000 (09:30 +0200)]
Added constant values for enumerators in their tooltips.

Change-Id: I75c5dc43832d42588302bc0dadefcd4b6e2addc6
Reviewed-on: http://codereview.qt.nokia.com/414
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
13 years agoQmlDesigner.nodeinstances: adding missing files
Thomas Hartmann [Wed, 8 Jun 2011 16:40:35 +0000 (18:40 +0200)]
QmlDesigner.nodeinstances: adding missing files

Change-Id: Ied53326c2f8c92b9af28591496e118eef69790b8
Reviewed-on: http://codereview.qt.nokia.com/410
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.navigatorView: turn NavigatorView into a QmlModelView
Thomas Hartmann [Wed, 8 Jun 2011 15:27:50 +0000 (17:27 +0200)]
QmlDesigner.navigatorView: turn NavigatorView into a QmlModelView

This will help in the future to add features like a context menu.

Change-Id: I194e79328b72798a8e000a8ca3abe48150965afb
Reviewed-on: http://codereview.qt.nokia.com/409
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoMaemo: Remove MaemoToolChain::sysroot() method.
Christian Kandeler [Wed, 8 Jun 2011 13:35:43 +0000 (15:35 +0200)]
Maemo: Remove MaemoToolChain::sysroot() method.

Functionality is already in MaemoQtVersion.
Also move some environment stuff there.

Change-Id: Ibbe91aed5611b1fa60afd3954767596af74b8c80
Reviewed-on: http://codereview.qt.nokia.com/387
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoQmlDesigner.model: refactoring for nodeSource
Thomas Hartmann [Wed, 8 Jun 2011 15:02:03 +0000 (17:02 +0200)]
QmlDesigner.model: refactoring for nodeSource

I changed customParserSource into nodeSource and use it also for
components. This means we do not use auxiliaryData anymore with some magic
__component_data identifier.
To distinguish between CustumParserSource and ComponentSource I introduced
the enum NodeSourceType.
Also in this patch I added auxiliaryData in the creation of a node. This was useful
for prototyping and will help with prototyping/testing in the future.

Change-Id: I2152c26c0c767f869f7dce7209abf43f594fd2ad
Reviewed-on: http://codereview.qt.nokia.com/399
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
13 years agoS60: Remove some dead code
Tobias Hunger [Wed, 8 Jun 2011 12:36:56 +0000 (12:36 +0000)]
S60: Remove some dead code

Change-Id: Ia7da72fa2a01cd3b563fcae0d7b4d1c99acc46eb
Reviewed-on: http://codereview.qt.nokia.com/384
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
13 years agoQmlDesigner: Fix warnings
Tobias Hunger [Wed, 8 Jun 2011 12:37:24 +0000 (12:37 +0000)]
QmlDesigner: Fix warnings

Change-Id: I21d103153dd0cebaf69ae57cbf19cfabd3ec3ead
Reviewed-on: http://codereview.qt.nokia.com/385
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.documentController: fix text design synchronisation
Thomas Hartmann [Wed, 8 Jun 2011 15:25:28 +0000 (17:25 +0200)]
QmlDesigner.documentController: fix text design synchronisation

The synchronisation of selection between text and designmode was broken.
This fixes a regression.

Change-Id: I4d3fd2f9716398a16e01ce3d389d099bfad1f66b
Reviewed-on: http://codereview.qt.nokia.com/401
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQMakeStep: Ask whether to recompile if 'Enable QML debugging' changed
Kai Koehne [Wed, 8 Jun 2011 11:32:03 +0000 (13:32 +0200)]
QMakeStep: Ask whether to recompile if 'Enable QML debugging' changed

Task-number: QTCREATORBUG-4633

Change-Id: I4116e63da6633bebb21ba08084e2d8edde4fbd6d
Reviewed-on: http://codereview.qt.nokia.com/383
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoRemoteLinux: Don't do a chmod on the executable before running.
Christian Kandeler [Wed, 8 Jun 2011 13:00:58 +0000 (15:00 +0200)]
RemoteLinux: Don't do a chmod on the executable before running.

It does not seem to be necessary anymore, Harmattan does not support it,
and it was a hack in the first place.

Change-Id: I393fda9dbc45a9da5d270df3cfd0b90dbbfbdf2e
Reviewed-on: http://codereview.qt.nokia.com/386
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoQmlDebugger: Always use ',block' argument
Kai Koehne [Wed, 8 Jun 2011 08:54:24 +0000 (10:54 +0200)]
QmlDebugger: Always use ',block' argument

This will allow e.g. the JS Debugger to catch scripts running at startup.

Change-Id: I00d339b06f1ed2b716c62bd2d53a32c2b20b1ddc
Reviewed-on: http://codereview.qt.nokia.com/377
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlLivePreview: correctly formating file URL
Christiaan Janssen [Tue, 7 Jun 2011 13:15:04 +0000 (15:15 +0200)]
QmlLivePreview: correctly formating file URL

Change-Id: I7c77d7854dac8e28cd5bcdeb4e6a8687fdb8606e
Reviewed-on: http://codereview.qt.nokia.com/361
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoAdd restore fallback functionality, make better tr()
Jarek Kobus [Wed, 8 Jun 2011 08:45:26 +0000 (10:45 +0200)]
Add restore fallback functionality, make better tr()

Task-number: QTCREATORBUG-5025
Change-Id: Ia3f6fa2380dd1a93f120873f584662a267ca4d50
Reviewed-on: http://codereview.qt.nokia.com/360
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
13 years agoMaemo: Fix make install to sysroot for Windows.
Christian Kandeler [Wed, 8 Jun 2011 09:07:00 +0000 (11:07 +0200)]
Maemo: Fix make install to sysroot for Windows.

Change-Id: If040c5c3b399a37c01d77fab6c16820466b4dc34
Reviewed-on: http://codereview.qt.nokia.com/373
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoRemoteLinux: Fix run configuration widget layout.
Christian Kandeler [Wed, 8 Jun 2011 06:59:16 +0000 (08:59 +0200)]
RemoteLinux: Fix run configuration widget layout.

Change-Id: I78374d2325a16d1a50ed46164385eebd7fdf6143
Reviewed-on: http://codereview.qt.nokia.com/372
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoRemoteLinux: Enable QML debugging for Harmattan.
Christian Kandeler [Tue, 7 Jun 2011 14:11:58 +0000 (16:11 +0200)]
RemoteLinux: Enable QML debugging for Harmattan.

The devices now have the relevant support libraries installed.

Change-Id: I94a78959ad28074258987388cb5ec6f394c3d3e9
Reviewed-on: http://codereview.qt.nokia.com/362
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoQt4: Find complete arguments passed to qmake
Tobias Hunger [Tue, 7 Jun 2011 15:09:32 +0000 (17:09 +0200)]
Qt4: Find complete arguments passed to qmake

Change-Id: If49183f2d8ed4ad3086dbdbfc20272127be22c25
Reviewed-on: http://codereview.qt.nokia.com/370
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQt4Target setup page: Do not enable targets without buildconfigurations
dt_ [Tue, 7 Jun 2011 14:56:37 +0000 (16:56 +0200)]
Qt4Target setup page: Do not enable targets without buildconfigurations

Typo in the code found by clang

Change-Id: Ibe1b7711625049418792013609467d4d34e0f886
Reviewed-on: http://codereview.qt.nokia.com/364
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agodebugger: adjust to new breakpoint notification feature
hjk [Tue, 7 Jun 2011 15:28:45 +0000 (17:28 +0200)]
debugger: adjust to new breakpoint notification feature

Change-Id: I0a4cdcb04da9cbc74b0676196aba1f38f3e87981
Reviewed-on: http://codereview.qt.nokia.com/367
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: fix a case of "overcompensation" when correcting breakpoint lines
hjk [Tue, 7 Jun 2011 15:21:45 +0000 (17:21 +0200)]
debugger: fix a case of "overcompensation" when correcting breakpoint lines

Change-Id: Idfca9513926004f5ab67c29838fc18c963a57a4b
Reviewed-on: http://codereview.qt.nokia.com/366
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: adjust dummy test ObjectPrivate layout for Qt 4.8 changes
hjk [Tue, 7 Jun 2011 11:30:16 +0000 (13:30 +0200)]
debugger: adjust dummy test ObjectPrivate layout for Qt 4.8 changes

Change-Id: I35914e79dce4894a5ec7f0ee656b86e4ce13e2a9
Reviewed-on: http://codereview.qt.nokia.com/365
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoFix build
Tobias Hunger [Tue, 7 Jun 2011 14:31:49 +0000 (16:31 +0200)]
Fix build

Change-Id: Idf8f0f367d329dad23d375bb08d3bc34bafe4115
Reviewed-on: http://codereview.qt.nokia.com/363
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoGit: Shrink down remote dialog
Tobias Hunger [Tue, 7 Jun 2011 08:33:28 +0000 (10:33 +0200)]
Git: Shrink down remote dialog

Task-number: QTCREATORBUG-5036
Change-Id: I9fc973acfb73c5da0489073a2130f5738656670d
Reviewed-on: http://codereview.qt.nokia.com/356
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
13 years agoqmake: Skip running qmake when using non-default tool chains
Tobias Hunger [Wed, 1 Jun 2011 15:03:44 +0000 (15:03 +0000)]
qmake: Skip running qmake when using non-default tool chains

Do not rerun qmake when using a tool chain which requires a
non-standard mkspec to be used.

Change-Id: I6171790805743251a7867111faa46bd4d4cc890d
Reviewed-on: http://codereview.qt.nokia.com/314
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoS60: Remove some dead code
Tobias Hunger [Sat, 4 Jun 2011 18:51:30 +0000 (20:51 +0200)]
S60: Remove some dead code

Change-Id: Id2c71078c71c52a6211bd3fe2ef4a18e009e5120
Reviewed-on: http://codereview.qt.nokia.com/349
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
13 years agoRemoteLinux: Change data type for better extensibility.
Christian Kandeler [Tue, 7 Jun 2011 10:12:30 +0000 (12:12 +0200)]
RemoteLinux: Change data type for better extensibility.

Other plugins are expected to build on the RemoteLinux infrastructure
in the future, providing OS types of their own. A string-based
identifier is much better suited for that than the currently used
enum approach.

Change-Id: I702a1ed7628d908d9c68ae0910ad1a6f1b92786f
Reviewed-on: http://codereview.qt.nokia.com/357
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoFix: Warning about assigning false to pointer
Tobias Hunger [Sat, 4 Jun 2011 18:39:38 +0000 (20:39 +0200)]
Fix: Warning about assigning false to pointer

Return a 0 pointer instead of false.

Change-Id: I8381e3e4a1cbac6f0c9e523ff177865a6886c76d
Reviewed-on: http://codereview.qt.nokia.com/344
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQt4: Remove dead code
Tobias Hunger [Sat, 4 Jun 2011 19:07:58 +0000 (21:07 +0200)]
Qt4: Remove dead code

Change-Id: I3c3575670720fafa1b81d553abaad81303836379
Reviewed-on: http://codereview.qt.nokia.com/351
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQmljs: removing unneeded Snapshot in find usages
Fawzi Mohamed [Mon, 6 Jun 2011 16:16:03 +0000 (18:16 +0200)]
Qmljs: removing unneeded Snapshot in find usages

removed snapshot from find usages, as now it is reachable through the
context

Change-Id: Ie470d275ae1b71caad4169234e6fc9af8687c7f0
Reviewed-on: http://codereview.qt.nokia.com/341
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoQmljs: added scope for blocks in UiScriptBindings and UiPublicMember
Fawzi Mohamed [Mon, 6 Jun 2011 12:13:50 +0000 (14:13 +0200)]
Qmljs: added scope for blocks in UiScriptBindings and UiPublicMember

correctly insert the scope for code blocks in UiScriptBindings and
UiPublicMember, and improve find usages for types (correctly detecting
variables in the same scope)

Change-Id: Iaaf1a59f041f3831fbe04243b220fb85fde76479
Reviewed-on: http://codereview.qt.nokia.com/335
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
13 years agoGit: remote dialog improvements
Tobias Hunger [Thu, 26 May 2011 20:34:22 +0000 (22:34 +0200)]
Git: remote dialog improvements

 * Add shortcuts
 * Add refresh button

Change-Id: Idfe5c86459d654ea75fb90542eaa4d9cc1405d33
Reviewed-on: http://codereview.qt.nokia.com/220
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoGit: Avoid running unnecessary git commands
Tobias Hunger [Thu, 26 May 2011 08:37:55 +0000 (10:37 +0200)]
Git: Avoid running unnecessary git commands

Change-Id: I09d6ac15a53e29a7a916be4b80ff2b99372eb079
Reviewed-on: http://codereview.qt.nokia.com/219
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoGit: fetch from remote
Tobias Hunger [Thu, 26 May 2011 08:20:09 +0000 (10:20 +0200)]
Git: fetch from remote

Task-number: QTCREATORBUG-4942
Change-Id: Ifd8586e110379a621c43233fe9b912bd82f7f28a
Reviewed-on: http://codereview.qt.nokia.com/218
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoVCS: Do not hide virtual methods
Tobias Hunger [Sat, 4 Jun 2011 19:07:34 +0000 (21:07 +0200)]
VCS: Do not hide virtual methods

Change-Id: I818eb8246f27b023e35155d50a8d08548660f709
Reviewed-on: http://codereview.qt.nokia.com/350
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoQMLJS: Remove dead code
Tobias Hunger [Sat, 4 Jun 2011 19:09:10 +0000 (21:09 +0200)]
QMLJS: Remove dead code

Change-Id: Ieb98a43ad1f5169b8da4c5d662a8f73605e2654f
Reviewed-on: http://codereview.qt.nokia.com/352
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoFix: Consistently use class for sshconnectionparameters
Tobias Hunger [Sat, 4 Jun 2011 18:40:59 +0000 (20:40 +0200)]
Fix: Consistently use class for sshconnectionparameters

Change-Id: I4b281418589e3e86a59175cd0388c7f6c73619d3
Reviewed-on: http://codereview.qt.nokia.com/346
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoFix: Do not assign false to a bool*
Tobias Hunger [Sat, 4 Jun 2011 18:40:21 +0000 (20:40 +0200)]
Fix: Do not assign false to a bool*

Dereference the pointer first...

Change-Id: Ifb5100684e76cacb658ff9fd8fd2003f22947eb4
Reviewed-on: http://codereview.qt.nokia.com/345
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoFix warning about unused parameter
Tobias Hunger [Sat, 4 Jun 2011 19:23:27 +0000 (21:23 +0200)]
Fix warning about unused parameter

Change-Id: I2844ebae2cd834b187f01b62d414692aa29b0605
Reviewed-on: http://codereview.qt.nokia.com/354
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
13 years agoClang: Improve parser
Tobias Hunger [Sat, 4 Jun 2011 17:29:57 +0000 (19:29 +0200)]
Clang: Improve parser

Do not pass on snippet lines to child parser where they might cause
confusion.

Change-Id: Ia30726842b0b0a4c2871c3b8e56539d9b79ccfd8
Reviewed-on: http://codereview.qt.nokia.com/343
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agodebugger: add possibility to fake response packets to trigger error handling
hjk [Mon, 6 Jun 2011 16:17:51 +0000 (18:17 +0200)]
debugger: add possibility to fake response packets to trigger error handling

Change-Id: Ieeb0daef594024b72e52c1180047835193e9341d
Reviewed-on: http://codereview.qt.nokia.com/340
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: more graceful fallback in case of unavailable line bounds
hjk [Mon, 6 Jun 2011 14:19:56 +0000 (16:19 +0200)]
debugger: more graceful fallback in case of unavailable line bounds

Change-Id: If8f323f3accd8e87f71e0b714efec4f5a7512f5b
Reviewed-on: http://codereview.qt.nokia.com/339
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: codadevice: merge multiple cleanup paths
hjk [Mon, 6 Jun 2011 13:31:31 +0000 (15:31 +0200)]
debugger: codadevice: merge multiple cleanup paths

Change-Id: Ia75a833652d32e2f02ea7ed448561f619d4945cc
Reviewed-on: http://codereview.qt.nokia.com/338
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: add manual test for QTCREATORBUG-3611
hjk [Mon, 6 Jun 2011 12:08:13 +0000 (14:08 +0200)]
debugger: add manual test for QTCREATORBUG-3611

Change-Id: I2bf2a9591dcb79a1396eb68cb76e45751170cdbc
Reviewed-on: http://codereview.qt.nokia.com/337
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoFileInProjectFinder: Try to find path in list of files even if project directory...
Kai Koehne [Wed, 1 Jun 2011 14:03:45 +0000 (16:03 +0200)]
FileInProjectFinder: Try to find path in list of files even if project directory is empty

Change-Id: I4c7e783b7fc43fc3ff68a04fcb2ff3b2cf14e109
Reviewed-on: http://codereview.qt.nokia.com/310
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQt4BuildConfiguration: Fix naming of slot
Kai Koehne [Wed, 25 May 2011 09:49:43 +0000 (11:49 +0200)]
Qt4BuildConfiguration: Fix naming of slot

Change-Id: I8b739afadd19e0f7c3503a11eb250a0662671958
Reviewed-on: http://codereview.qt.nokia.com/309
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQmljs: find usages for types and packages
Fawzi Mohamed [Mon, 6 Jun 2011 09:17:12 +0000 (11:17 +0200)]
Qmljs: find usages for types and packages

detects and finds usages of types and packages in qml and javascript

Change-Id: Id13f48e435258ff10ab3e6f49049f7bb602a900f
Reviewed-on: http://codereview.qt.nokia.com/277
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
13 years agodebugger: allow "Attach to Core" on Windows
hjk [Mon, 6 Jun 2011 11:25:52 +0000 (13:25 +0200)]
debugger: allow "Attach to Core" on Windows

Patch by Orgad Shaneh

Task-number: QTCREATORBUG-3813
Change-Id: I7ff88946981ef210bb53e20d7e462055199a30e2
Reviewed-on: http://codereview.qt.nokia.com/332
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoRemove unused file (again?)
Christian Kandeler [Fri, 3 Jun 2011 14:02:24 +0000 (16:02 +0200)]
Remove unused file (again?)

Was forgotten during a refactoring or crept back in when
the plugin was moved.

Change-Id: I02daa1024f6165c2eedb427cc097c33a5254b42a
Reviewed-on: http://codereview.qt.nokia.com/327
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agovcsbase: remove facility tool buttons in EditorParameterWidget
cerf [Fri, 3 Jun 2011 12:57:10 +0000 (12:57 +0000)]
vcsbase: remove facility tool buttons in EditorParameterWidget

Because diff options are VCS-specific, these methods were removed :
  VCSBaseEditorParameterWidget::addIgnoreWhiteSpaceButton()
  VCSBaseEditorParameterWidget::addIgnoreBlankLinesButton()
  Associated msg*Label() and msg*ToolTip()
This impacts cvs, hg, perforce, svn and bzr plugins

Change-Id: I8d213ed3915653b78bae9ba8b6cbbd65fa269ce2
Merge-request: 340
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/323
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoDoc: indenting code in the list of topics related to coding
Leena Miettinen [Fri, 3 Jun 2011 11:40:36 +0000 (13:40 +0200)]
Doc: indenting code in the list of topics related to coding

Change-Id: I0c30c04f75649a34b8d68a79c96a3e155cdb2ab2
Reviewed-on: http://codereview.qt.nokia.com/322
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
13 years agoQmlJS: Fix uses of Scanner::state().
Christian Kamm [Fri, 3 Jun 2011 06:49:40 +0000 (08:49 +0200)]
QmlJS: Fix uses of Scanner::state().

Change-Id: I5195fc43e8a6653bf52c0eaa6cddb8dfd25b6217
Reviewed-on: http://codereview.qt.nokia.com/319
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agodebugger: don't crash when telling a dead runcontrol about a pid
hjk [Wed, 1 Jun 2011 16:58:55 +0000 (18:58 +0200)]
debugger: don't crash when telling a dead runcontrol about a pid

Change-Id: I1cf33f3587de2e8e35a74a15aa797539f2f58014
Reviewed-on: http://codereview.qt.nokia.com/318
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoQt4RunConfiguration: update environment after .pro parse
dt_ [Wed, 1 Jun 2011 16:13:00 +0000 (18:13 +0200)]
Qt4RunConfiguration: update environment after .pro parse

Since the PATH/LD_LIBRARY_PATH depend on the LIBS variable,
we need to emit a environment changed signal after parsing

Change-Id: Ib4e276874dd6a8529c81b7ce10c53773c39cf508
Reviewed-on: http://codereview.qt.nokia.com/317
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agofix build
Oswald Buddenhagen [Wed, 1 Jun 2011 15:31:02 +0000 (17:31 +0200)]
fix build

add missing define.
stupid qmake ...

Change-Id: I3cec37b87caa6f2c0432bc75c712d5663fb191e6
Reviewed-on: http://codereview.qt.nokia.com/316
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
13 years agofix whitespace
Oswald Buddenhagen [Wed, 1 Jun 2011 15:14:47 +0000 (17:14 +0200)]
fix whitespace

Change-Id: I430cb68948e7c3dab108e88b28d0bc53796c6a0a
Reviewed-on: http://codereview.qt.nokia.com/315
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoDebugger: Add project directory / file information also for S60/Maemo
Kai Koehne [Wed, 1 Jun 2011 14:16:28 +0000 (16:16 +0200)]
Debugger: Add project directory / file information also for S60/Maemo

The project directory / list of files are used to map remote to local files
for QML debugging.

Change-Id: I5aa1c4ea495d457e7af05bafcfead9c434231758
Reviewed-on: http://codereview.qt.nokia.com/311
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoDebugger[CDB]: Add version number to QtInfo struct in ext lib.
Friedemann Kleint [Wed, 1 Jun 2011 15:01:47 +0000 (17:01 +0200)]
Debugger[CDB]: Add version number to QtInfo struct in ext lib.

Run in a loop over qtVersion =4,5 when detecting the Qt modules
(quick detection). Add version field for later evaluation in
dumpers.
Reformat comments.

Change-Id: Ia3005fccbb92b847a0f1feef99a53eb4c318246f
Reviewed-on: http://codereview.qt.nokia.com/313
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoadd ProFileOption::initProperties()
Oswald Buddenhagen [Wed, 1 Jun 2011 14:01:22 +0000 (16:01 +0200)]
add ProFileOption::initProperties()

centralize support for default-initialization of qmake properties with,
duh, qmake (-query).

Change-Id: If97725fa61779819f6afb9073042b667d7253e5d
Reviewed-on: http://codereview.qt.nokia.com/308
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoadd proparser_global.h to HEADERS
Oswald Buddenhagen [Tue, 31 May 2011 17:40:11 +0000 (19:40 +0200)]
add proparser_global.h to HEADERS

just for good measure ...

Change-Id: Ib039a0c4cd2086537706082f16257f97cb9ca2e4
Reviewed-on: http://codereview.qt.nokia.com/307
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agomake cumulative mode support in ProFileEvaluator optional
Oswald Buddenhagen [Tue, 31 May 2011 17:19:34 +0000 (19:19 +0200)]
make cumulative mode support in ProFileEvaluator optional

just in case it gets used for something "real" ...

making exact mode optional would make no sense, as feature files always
need to be evaluated exactly for meaningful results.

Change-Id: I568ab751cf74790e0f79b54248202412c39a68ea
Reviewed-on: http://codereview.qt.nokia.com/306
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoclang: Do not keep tasks around too long
Tobias Hunger [Wed, 1 Jun 2011 14:17:47 +0000 (14:17 +0000)]
clang: Do not keep tasks around too long

Change-Id: Ieb03e2ed3fa2ac54dede30107942666aee11d43c
Reviewed-on: http://codereview.qt.nokia.com/312
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoencoding: Make sure all text files are utf8 encoded
Tobias Hunger [Tue, 31 May 2011 15:53:35 +0000 (15:53 +0000)]
encoding: Make sure all text files are utf8 encoded

Change-Id: Ib83224b24026c29158e8df8fa235cf5050390555
Reviewed-on: http://codereview.qt.nokia.com/281
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agodebugger: update bp target line when editing file while engine running
hjk [Wed, 1 Jun 2011 11:24:29 +0000 (13:24 +0200)]
debugger: update bp target line when editing file while engine running

Task-number: QTCREATORBUG-2314
Change-Id: If79f3aa70f932b82905351828b28fde42824c90e
Reviewed-on: http://codereview.qt.nokia.com/303
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoMake the linenumbers area 5 digits big
dt_ [Wed, 1 Jun 2011 10:13:01 +0000 (12:13 +0200)]
Make the linenumbers area 5 digits big

That's enough for everyone.
Task-Nr: QTCREATORBUG-5056

Change-Id: Ib35b7d55a571a6d68ffa91ffa2cdb4666a22b9b8
Reviewed-on: http://codereview.qt.nokia.com/301
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agobuild dev docs in doc/html-dev instead of doc/api/html
Oswald Buddenhagen [Tue, 31 May 2011 15:23:38 +0000 (17:23 +0200)]
build dev docs in doc/html-dev instead of doc/api/html

Change-Id: I42c13004e6a80b27c0f1690c76b35a0d40cee6ad
Reviewed-on: http://codereview.qt.nokia.com/289
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agointegrate developer docs into the normal docs build
Oswald Buddenhagen [Tue, 31 May 2011 15:13:23 +0000 (17:13 +0200)]
integrate developer docs into the normal docs build

Change-Id: Ie94fe37f9025643c35c14a224661295e6c4c9a41
Reviewed-on: http://codereview.qt.nokia.com/288
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agofix shadow building of apidocs
Oswald Buddenhagen [Tue, 31 May 2011 15:00:47 +0000 (17:00 +0200)]
fix shadow building of apidocs

fix $OUTDIR and actually use it

Change-Id: Ic0bf2eb98997e3f8934cc574df5b5fd109bee473
Reviewed-on: http://codereview.qt.nokia.com/287
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agomake images non-executable
Oswald Buddenhagen [Tue, 31 May 2011 15:19:28 +0000 (17:19 +0200)]
make images non-executable

Change-Id: Id1c5189db9091fa69327bab4db454e3c55bd2286
Reviewed-on: http://codereview.qt.nokia.com/286
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agode-duplicate doc templates
Oswald Buddenhagen [Tue, 31 May 2011 14:58:12 +0000 (16:58 +0200)]
de-duplicate doc templates

Change-Id: I6672b08ac8b8ea8de76d3a3850330a8dda2d6767
Reviewed-on: http://codereview.qt.nokia.com/285
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agomove install code where it belongs
Oswald Buddenhagen [Tue, 31 May 2011 09:38:39 +0000 (11:38 +0200)]
move install code where it belongs

make inst_qch_docs a separate "structure" to avoid confusion, and move
the .files assignment to that structure's initializer.

Change-Id: I896ccaabe701736ca82db31c189ed88a19d1e8ad
Reviewed-on: http://codereview.qt.nokia.com/284
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agostand-alone api generation not supported any more
Oswald Buddenhagen [Tue, 31 May 2011 09:35:21 +0000 (11:35 +0200)]
stand-alone api generation not supported any more

you are supposed to build the whole dev doc instead

Change-Id: I1cdc86482e8ad73440a5e57f6eb41b661d4e536a
Reviewed-on: http://codereview.qt.nokia.com/283
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoun-confuse qdoc
Oswald Buddenhagen [Tue, 31 May 2011 15:12:44 +0000 (17:12 +0200)]
un-confuse qdoc

it's apparently too stupid for our _() inlines, so just skip them.

Change-Id: Idea9c2f86ecb3c915cc90a02eb987c7c0ac93b95
Reviewed-on: http://codereview.qt.nokia.com/282
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoEditors: Make snippets and code style honor font settings
Leandro Melo [Tue, 31 May 2011 14:36:58 +0000 (16:36 +0200)]
Editors: Make snippets and code style honor font settings

Task-number: QTCREATORBUG-5007

Change-Id: Ied78ef17ea7a25d22c37d36fd4eb7257c6c9f4c0
Reviewed-on: http://codereview.qt.nokia.com/293
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
13 years agooutputparser: Fix overriding a virtual method
Tobias Hunger [Wed, 1 Jun 2011 09:17:23 +0000 (09:17 +0000)]
outputparser: Fix overriding a virtual method

Change-Id: I2e0f2525e674e1b1d6e337d211adb16586478518
Reviewed-on: http://codereview.qt.nokia.com/300
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoC++ indenter: Fix multiple initializers.
Christian Kamm [Wed, 1 Jun 2011 09:10:57 +0000 (11:10 +0200)]
C++ indenter: Fix multiple initializers.

Task-number: QTCREATORBUG-4993
Change-Id: I0f7d541eb7b26c37b8167e30e2949b6b939fe4b8
Reviewed-on: http://codereview.qt.nokia.com/297
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoRemoteLinux: Fix 7bcc90168f7bfbb3cddd2594d133f061011a8e83.
Christian Kandeler [Wed, 1 Jun 2011 08:52:10 +0000 (10:52 +0200)]
RemoteLinux: Fix 7bcc90168f7bfbb3cddd2594d133f061011a8e83.

Change-Id: I14fc86bac1dd433860093a34215f101cd8e99c85
Reviewed-on: http://codereview.qt.nokia.com/296
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoRemoteLinux: Keep enabled state in sync with active build configuration.
Christian Kandeler [Wed, 1 Jun 2011 08:44:33 +0000 (10:44 +0200)]
RemoteLinux: Keep enabled state in sync with active build configuration.

Change-Id: I08c89794ccc37d89f78e737e360016015314a6e0
Reviewed-on: http://codereview.qt.nokia.com/295
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>