OSDN Git Service

qt-creator-jp/qt-creator-jp.git
13 years agoExtend the editor sidebar background to the folding markers
Thorbjørn Lindeijer [Tue, 7 Jun 2011 09:05:31 +0000 (11:05 +0200)]
Extend the editor sidebar background to the folding markers

Previously, there was a gab between the text and the sidebar which
contained the folding markers. This is disturbing for some users.

Change-Id: Ib3c90d9cb01de533d16049bc1a0f5f10f1f7847a
Task-number: QTCREATORBUG-2915
Reviewed-on: http://codereview.qt.nokia.com/355
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
13 years agoRemoteLinux: Export and re-use wizard page.
Christian Kandeler [Tue, 21 Jun 2011 10:44:52 +0000 (12:44 +0200)]
RemoteLinux: Export and re-use wizard page.

Also rename the respective file to better reflect its new purpose.

Change-Id: I815807a958d2d76db87d4d27b63338f5ced9ffeb
Reviewed-on: http://codereview.qt.nokia.com/544
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoRevert "Completion: Apply perfect match whenever not invoked explicitly"
Leandro Melo [Tue, 21 Jun 2011 09:06:03 +0000 (11:06 +0200)]
Revert "Completion: Apply perfect match whenever not invoked explicitly"

This reverts commit 4959f53d2c54515de73cb40c8363cd7ce6d24e03.

It seems that usability is better when upon a perfect match the completion
popup stays when triggered either explicitly or by an activation character.
After all, in general one should need to type something else (semicolon,
parenthesis, etc.) anyway for the case of an activation character.

This is also consistent with the behavior from previous releases.

Change-Id: I1d50230affb1d0642f8f8bfd5cbac69dc52e44bd
Reviewed-on: http://codereview.qt.nokia.com/536
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
13 years agoMaemo: Stricter check when restoring run configuration.
Christian Kandeler [Tue, 21 Jun 2011 09:51:34 +0000 (11:51 +0200)]
Maemo: Stricter check when restoring run configuration.

Change-Id: Idf6b0500e390cda50c1686c9a5b7fff4f6b19e94
Reviewed-on: http://codereview.qt.nokia.com/542
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoRemoteLinux: Debugger run control can be null.
Christian Kandeler [Tue, 21 Jun 2011 09:51:20 +0000 (11:51 +0200)]
RemoteLinux: Debugger run control can be null.

Change-Id: Ic2bd036b54fcc4af174d4f6d26b9640073ea6013
Reviewed-on: http://codereview.qt.nokia.com/541
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoQmlProfiler: Time display with 3 decimals
Christiaan Janssen [Tue, 21 Jun 2011 07:58:05 +0000 (09:58 +0200)]
QmlProfiler: Time display with 3 decimals

Change-Id: I2421f7cd01e89a41489d5e6355cc83833e21ffcc
Reviewed-on: http://codereview.qt.nokia.com/535
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoQmlProfiler: displaying event durations in milliseconds
Christiaan Janssen [Mon, 20 Jun 2011 16:23:02 +0000 (18:23 +0200)]
QmlProfiler: displaying event durations in milliseconds

Change-Id: Idec442d744891bae8c9986717c32283a9440db9b
Reviewed-on: http://codereview.qt.nokia.com/531
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlProfiler: clean up old code
Christiaan Janssen [Mon, 20 Jun 2011 16:18:28 +0000 (18:18 +0200)]
QmlProfiler: clean up old code

Change-Id: Id464b073eb05341e48876ace9ff39e16d6302144
Reviewed-on: http://codereview.qt.nokia.com/530
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlProfiler: time display
Christiaan Janssen [Mon, 20 Jun 2011 16:11:17 +0000 (18:11 +0200)]
QmlProfiler: time display

Change-Id: Ib1a0e7693f00e3d870407c62f7f238c962ef8b48
Reviewed-on: http://codereview.qt.nokia.com/529
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlProfiler: adjust timeline background to width
Christiaan Janssen [Mon, 20 Jun 2011 11:36:11 +0000 (13:36 +0200)]
QmlProfiler: adjust timeline background to width

Change-Id: Ice7fd81994dd93571fa2f172cbaa611a55f07721
Reviewed-on: http://codereview.qt.nokia.com/528
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agoQmlProfiler: Event details stay when mouseExit
Christiaan Janssen [Wed, 15 Jun 2011 13:26:28 +0000 (15:26 +0200)]
QmlProfiler: Event details stay when mouseExit

Change-Id: I506eb085f0c2bf1970c9a56d2838f94931bce1f0
Reviewed-on: http://codereview.qt.nokia.com/489
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agotr()-fix.
Friedemann Kleint [Tue, 21 Jun 2011 07:53:29 +0000 (09:53 +0200)]
tr()-fix.

Change-Id: I7f9b5ff052e2560c00f80037e2883ed871dd964e
Reviewed-on: http://codereview.qt.nokia.com/534
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agodebugger: add manual test for map<string, list<string> >
hjk [Mon, 20 Jun 2011 15:53:59 +0000 (17:53 +0200)]
debugger: add manual test for map<string, list<string> >

Change-Id: I191fdc6ce9f8fbe7e83258b592a0030c91b872dd
Reviewed-on: http://codereview.qt.nokia.com/527
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoRemoteLinux: More untangling of generic and Maemo-specific stuff.
Christian Kandeler [Thu, 16 Jun 2011 15:03:43 +0000 (17:03 +0200)]
RemoteLinux: More untangling of generic and Maemo-specific stuff.

- Make key deployment a device type dependent action.
- Split up monolithic device configuration wizard.
- Split up run configurations, run controls and the associated
  factories.

Change-Id: Ib2ef9d405e6b7eaae89fc27c56e3c327829a88f7
Reviewed-on: http://codereview.qt.nokia.com/486
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoQmlDesigner.designModeWidget: fix
Thomas Hartmann [Mon, 20 Jun 2011 15:47:09 +0000 (17:47 +0200)]
QmlDesigner.designModeWidget: fix

Using a QWeakPointer for m_textEditor, since the texteditor might be
deleted if the document was closed.
Moving the NavigationHistory handling upwards.

Change-Id: Ib5c14d6cd139490379cc2bf76d5440720c5664bc
Reviewed-on: http://codereview.qt.nokia.com/526
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoanaylyzer: remove "goto overview" action in callgrind tool
hjk [Mon, 20 Jun 2011 15:41:04 +0000 (17:41 +0200)]
anaylyzer: remove "goto overview" action in callgrind tool

Change-Id: I02fcc8ef5983c9759448ea8f831f46a44eb5c184
Reviewed-on: http://codereview.qt.nokia.com/525
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoanalyzer: remove some leftovers from the valgrind merge
hjk [Mon, 20 Jun 2011 15:39:20 +0000 (17:39 +0200)]
analyzer: remove some leftovers from the valgrind merge

Change-Id: Ide127840c2dca16927e3be9b95c6dd29d0ee42fc
Reviewed-on: http://codereview.qt.nokia.com/524
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoanalyzer: add 'redo' to callgrind result navigation
hjk [Mon, 20 Jun 2011 15:30:38 +0000 (17:30 +0200)]
analyzer: add 'redo' to callgrind result navigation

Change-Id: Ic7b348fc8df57f8a4d7a361d67b2c183ef7f1a46
Reviewed-on: http://codereview.qt.nokia.com/523
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: with gdb 7.3 we can have proper display of dynamic types.
hjk [Mon, 20 Jun 2011 13:23:28 +0000 (15:23 +0200)]
debugger: with gdb 7.3 we can have proper display of dynamic types.

So use it.

Change-Id: If33d087a9b767f0b2e6b16e57a36e9e7aa6e7c16
Reviewed-on: http://codereview.qt.nokia.com/522
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoSmall refactor
Jarek Kobus [Mon, 20 Jun 2011 14:23:40 +0000 (16:23 +0200)]
Small refactor

Change-Id: I2988ce1c2a73798abccf690a3ed5d4e3a92c91a2
Reviewed-on: http://codereview.qt.nokia.com/517
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoRemove unused methods
Jarek Kobus [Mon, 20 Jun 2011 14:10:59 +0000 (16:10 +0200)]
Remove unused methods

Change-Id: I62d09b50a94c0d3bf3ef670bd6d070b5c74c88e6
Reviewed-on: http://codereview.qt.nokia.com/509
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoFix behavior settings
Jarek Kobus [Mon, 20 Jun 2011 14:22:02 +0000 (16:22 +0200)]
Fix behavior settings

Change-Id: Iefacbfeeff284c53b2edfd1c6c8a7fcb90348b54
Reviewed-on: http://codereview.qt.nokia.com/516
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
13 years agoQmlDesigner.componentView: code cleanup
Thomas Hartmann [Mon, 20 Jun 2011 14:46:18 +0000 (16:46 +0200)]
QmlDesigner.componentView: code cleanup

Explicit braces to avoid ambiguous ‘else’.

Change-Id: Ic1a48b41b229ba47f7ab737a883277a6547e30ce
Reviewed-on: http://codereview.qt.nokia.com/521
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.desigModeWidget: add navigator to toolbar
Thomas Hartmann [Mon, 20 Jun 2011 14:33:10 +0000 (16:33 +0200)]
QmlDesigner.desigModeWidget: add navigator to toolbar

Now we have a navigation history in the DesignMode.
The check (m_textEditor && editor) is there to keep the history clean.

Change-Id: I26bbefe45b51c53379bfecbe1cdc02a64df76012d
Reviewed-on: http://codereview.qt.nokia.com/519
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoFix crash when changing font settings
Leandro Melo [Mon, 20 Jun 2011 12:25:55 +0000 (14:25 +0200)]
Fix crash when changing font settings

The snippets page should not operate on the font settings
changed signal when the ui does not exist.

Task-number: QTCREATORBUG-5173
Change-Id: Ic1363cb41340b5ea04803eb27de3dd0af6ecda0c
Reviewed-on: http://codereview.qt.nokia.com/511
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoAdd a dialog for editing the file list of generic projects
Daniel Teske [Mon, 20 Jun 2011 09:57:20 +0000 (11:57 +0200)]
Add a dialog for editing the file list of generic projects

Task-Nr: QTCREATORBUG-5112

Change-Id: Ic39c4346f2c64b05c314f3c03d963994e043dc45
Reviewed-on: http://codereview.qt.nokia.com/500
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
13 years agoDocumentation: Clarify global variables.
Friedemann Kleint [Mon, 20 Jun 2011 12:14:49 +0000 (14:14 +0200)]
Documentation: Clarify global variables.

Rubber-stamped-by: hjk
Change-Id: Ic5d8a50deeee93572d838725d1cf4d2af6245c0f
Reviewed-on: http://codereview.qt.nokia.com/510
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoExternal editors: Fall back to path if not found in Qt version.
Friedemann Kleint [Mon, 20 Jun 2011 10:32:22 +0000 (12:32 +0200)]
External editors: Fall back to path if not found in Qt version.

Use Designer/Linguist executables from path if (embedded)
Qt version does not ship them.

Task-number: QTCREATORBUG-4826
Change-Id: Ide2fe0e59a8ea8f93a9193e0f97877631ce68470
Reviewed-on: http://codereview.qt.nokia.com/502
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agodebugger: add test manual case for displayin dynamic type
hjk [Mon, 20 Jun 2011 10:46:32 +0000 (12:46 +0200)]
debugger: add test manual case for displayin dynamic type

Change-Id: I1120182c18a2ded59bfd46a6082eaef8cbd723ee
Reviewed-on: http://codereview.qt.nokia.com/504
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoAdd model tester to Creator sources.
hjk [Mon, 20 Jun 2011 10:44:57 +0000 (12:44 +0200)]
Add model tester to Creator sources.

Change-Id: Idf7519b1bcaf8c83d00a4d78674049a79bf0aa6d
Reviewed-on: http://codereview.qt.nokia.com/503
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoAdd menu item to clear the recent projects/files menus.
con [Mon, 20 Jun 2011 09:01:23 +0000 (11:01 +0200)]
Add menu item to clear the recent projects/files menus.

Task-number: QTCREATORBUG-5136

Change-Id: I27d5c86832277be9525d95fd1e38a3b86f620974
Reviewed-on: http://codereview.qt.nokia.com/496
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoSymbian: Remove TRK releated stuff from tests
Pawel Polanski [Mon, 20 Jun 2011 09:54:39 +0000 (11:54 +0200)]
Symbian: Remove TRK releated stuff from tests

Change-Id: Ie5142d4ee21470bceeeb3f27bc9f4646d6ac0af7
Reviewed-on: http://codereview.qt.nokia.com/501
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
13 years agodebugger: add test case for #5106
hjk [Wed, 15 Jun 2011 14:23:28 +0000 (16:23 +0200)]
debugger: add test case for #5106

Change-Id: Ia6c765671f14298400dedaa7797e09cf6cd1e6b1
(cherry picked from commit 67187b215218b7a0ade5ae0da898f7edb71ee3b4)
Reviewed-on: http://codereview.qt.nokia.com/499
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: display "sub-breakpoints"
hjk [Wed, 15 Jun 2011 12:02:26 +0000 (14:02 +0200)]
debugger: display "sub-breakpoints"

<MULTIPLE> happens in constructors, inline functions, and
at other places like 'foreach' lines.

Change-Id: Ifb89b659d279f257ba8295b80a35d605820ec54b
Reviewed-on: http://codereview.qt.nokia.com/498
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agodebugger: make QModelIndex and QAbstractItemModel dumper work on core files
hjk [Wed, 15 Jun 2011 06:37:46 +0000 (08:37 +0200)]
debugger: make QModelIndex and QAbstractItemModel dumper work on core files

Change-Id: I299334f2b552d4b051dfd9d0d4d85a54b92d0c2d
Reviewed-on: http://codereview.qt.nokia.com/497
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
13 years agoMake qmake browse button follow the naming convention.
con [Mon, 20 Jun 2011 08:06:16 +0000 (10:06 +0200)]
Make qmake browse button follow the naming convention.

Change-Id: I599f81a9e320f970b6f44df566d599508dfa0a7f
Reviewed-on: http://codereview.qt.nokia.com/488
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoMake it possible to select Qt version on Mac OS.
con [Wed, 15 Jun 2011 14:39:05 +0000 (16:39 +0200)]
Make it possible to select Qt version on Mac OS.

Need to work around QTBUG-7739 that prohibits filters that don't start
with *

Change-Id: Ia984b25903abab125b403b53b5f3fe70ac9c54d4
Reviewed-on: http://codereview.qt.nokia.com/482
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoL10n: German translation for 2.3.
Friedemann Kleint [Mon, 20 Jun 2011 08:46:47 +0000 (10:46 +0200)]
L10n: German translation for 2.3.

Change-Id: I33889fba7a9b7dfcf4fb84188fc0526230005e12
Reviewed-on: http://codereview.qt.nokia.com/494
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agotr()-Fixes for 2.3: Small spelling/notr-fixes.
Friedemann Kleint [Mon, 20 Jun 2011 08:46:12 +0000 (10:46 +0200)]
tr()-Fixes for 2.3: Small spelling/notr-fixes.

QML Profiler,etc.

Change-Id: Ie4c5b6152735b45257856340797b446c3360edd5
Reviewed-on: http://codereview.qt.nokia.com/493
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoQmlProfiler: changed display name to QML Profiler
Christiaan Janssen [Mon, 20 Jun 2011 08:20:08 +0000 (10:20 +0200)]
QmlProfiler: changed display name to QML Profiler

Change-Id: Ieb9cf689d72986b3ede931f327b048d25a53cf6e
Reviewed-on: http://codereview.qt.nokia.com/490
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoQmlDesigner.rewriterView: setupImports even if semantic checks fail
Thomas Hartmann [Wed, 15 Jun 2011 15:25:48 +0000 (17:25 +0200)]
QmlDesigner.rewriterView: setupImports even if semantic checks fail

Change-Id: Idb243372f4c639c91ea3085c3fdf916758ddcf49
Reviewed-on: http://codereview.qt.nokia.com/485
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoQmlDesigner.nodeInstances: fix regression
Thomas Hartmann [Wed, 15 Jun 2011 14:33:13 +0000 (16:33 +0200)]
QmlDesigner.nodeInstances: fix regression

Images are visible again.

Change-Id: I02c2a2e741accda4d3f67cbb2a1cf5a12cabafb1
Reviewed-on: http://codereview.qt.nokia.com/484
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agotr()-Fixes for 2.3: Small spelling/notr-fixes.
Friedemann Kleint [Wed, 15 Jun 2011 15:20:33 +0000 (17:20 +0200)]
tr()-Fixes for 2.3: Small spelling/notr-fixes.

Change-Id: I66b8b0e20b225429b4399dfca154a2806260ac61
Reviewed-on: http://codereview.qt.nokia.com/483
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoMaemo: Fix check toolchain check for valid Qt version.
Christian Kandeler [Tue, 14 Jun 2011 14:33:58 +0000 (16:33 +0200)]
Maemo: Fix check toolchain check for valid Qt version.

Change-Id: Icf34111ad63cd4e76c5eb8bd18111e7317f07c9c
Reviewed-on: http://codereview.qt.nokia.com/479
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agotr()-Fixes for 2.3: No contractions, spelling.
Friedemann Kleint [Tue, 14 Jun 2011 15:17:24 +0000 (17:17 +0200)]
tr()-Fixes for 2.3: No contractions, spelling.

Change-Id: I08babdb15bcf7f7ac086e9e12955b780b7591391
Reviewed-on: http://codereview.qt.nokia.com/480
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoClose write channel of external processes
Orgad Shaneh [Tue, 14 Jun 2011 14:47:10 +0000 (16:47 +0200)]
Close write channel of external processes

Prevents external process from waiting for user input.

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

13 years agoQmlProfiler: zooming on the timeline
Christiaan Janssen [Tue, 14 Jun 2011 11:16:23 +0000 (13:16 +0200)]
QmlProfiler: zooming on the timeline

Change-Id: I3057c687d9e812448fd2c2846b06ac7c2d32d5e3
Reviewed-on: http://codereview.qt.nokia.com/476
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoMaemo: Remove support for debugging with an on-device gdb.
Christian Kandeler [Tue, 14 Jun 2011 13:06:16 +0000 (15:06 +0200)]
Maemo: Remove support for debugging with an on-device gdb.

It was only a workaround for a Fremantle problem that no longer
exists and has no advantages to the gdbserver approach.

Change-Id: Ia92c3e423fde3735a010d8abff646593f8bccdda
Reviewed-on: http://codereview.qt.nokia.com/478
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoAdd a toolchain combo box to the cmake run page
dt [Tue, 14 Jun 2011 11:42:45 +0000 (13:42 +0200)]
Add a toolchain combo box to the cmake run page

Selecting the toolchain is a configure time setting for cmake. So
that's the right place, except for us the debugger also depends
on the toolchain. Switching the debugger thus involves reconfiguring.

Also due to the cmake cache in most cases reconfiguring with a different
toolchain selected won't do anything.

Cmake and creator's concept of toolchains clash.

Task-Nr: QTCREATORBUG-4898

Change-Id: Ibf84029d7008046891750a91666d0e3e4711ec69
Reviewed-on: http://codereview.qt.nokia.com/477
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoQmlDesigner: Add new dependencies to plugins.pro
Kai Koehne [Tue, 14 Jun 2011 09:28:41 +0000 (11:28 +0200)]
QmlDesigner: Add new dependencies to plugins.pro

Change-Id: I31d1938194574dbc90b4df948b70781679f4830d
Reviewed-on: http://codereview.qt.nokia.com/472
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agotr()-fixes for 2.3.
Friedemann Kleint [Tue, 14 Jun 2011 10:22:14 +0000 (12:22 +0200)]
tr()-fixes for 2.3.

Change-Id: I38345500156ce6fa4eb747562a3f9434040615ff
Reviewed-on: http://codereview.qt.nokia.com/473
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoRemoteLinux: Make device configurations settings page generic.
Christian Kandeler [Thu, 9 Jun 2011 15:17:01 +0000 (17:17 +0200)]
RemoteLinux: Make device configurations settings page generic.

The list of per-device actions now comes from a factory and can
be different for different OS types.
This is a step towards moving knowledge about devices from the
RemoteLinux plugin into specialized plugins.

Change-Id: Ia46e0199d8d8c1a3891c73a4936ac53fb1063313
Reviewed-on: http://codereview.qt.nokia.com/439
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
13 years agoAdd a disabled reason to the display of runconfigurations
dt_ [Fri, 10 Jun 2011 13:37:10 +0000 (15:37 +0200)]
Add a disabled reason to the display of runconfigurations

Also distinguish between qt runconfigurations that are disabled
due to parsing and due to not being parseable

Change-Id: Ia8ce4eaa7b6bfcc2c5290b254bb288c6d4892170
Task-Nr: QTCREATORBUG-5103
Reviewed-on: http://codereview.qt.nokia.com/451
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoQmlProfiler: Add qt4projectmanager dependency also in plugins.pro
Kai Koehne [Tue, 14 Jun 2011 09:02:17 +0000 (11:02 +0200)]
QmlProfiler: Add qt4projectmanager dependency also in plugins.pro

Make sure qt4projectmanager is built before qmlprofiler gets linked.

Change-Id: I34efcdd431c18b5941e0748213fec0b8e80d1600
Reviewed-on: http://codereview.qt.nokia.com/469
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
13 years agoQmlDesigner.plugins: getters should be const
Thomas Hartmann [Tue, 14 Jun 2011 09:06:59 +0000 (11:06 +0200)]
QmlDesigner.plugins: getters should be const

metaInfo() and pluginName are now const.

Change-Id: I41ad0ad11d19268e18e839adcdbd8fb6bfba629d
Reviewed-on: http://codereview.qt.nokia.com/470
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoManhattanstyle: Fix IndicatorToolBarHandle
Tobias Hunger [Sat, 4 Jun 2011 18:47:29 +0000 (20:47 +0200)]
Manhattanstyle: Fix IndicatorToolBarHandle

operator + binds stronger than ?, so the evaluation of the expressions was
screwed up.

Change-Id: Id38adf6e17ea770d1d3219649629b06bfc2ca643
Reviewed-on: http://codereview.qt.nokia.com/348
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
13 years agoAnalyzer: Use Utils::OutputFormat everywhere
Kai Koehne [Fri, 10 Jun 2011 14:34:06 +0000 (16:34 +0200)]
Analyzer: Use Utils::OutputFormat everywhere

Replace hard distinction between 'out', 'err' with flexible
OutputFormat. Also make sure that QmlProfiler shows application output.

Change-Id: I130c71884321e4c59c9a75f0836c37a7f0e805c4
Reviewed-on: http://codereview.qt.nokia.com/458
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
13 years agovcsbase: simplify init of the diff editor in VCSBaseClient
cerf [Fri, 10 Jun 2011 15:27:57 +0000 (15:27 +0000)]
vcsbase: simplify init of the diff editor in VCSBaseClient

Bazaar and Mercurial plugins are impacted, they benefit auto load/save
of the diff settings

Change-Id: I67327b231fd80eeb61bb859879f9eabdc56739e8
Merge-request: 345
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/463
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoBazaar: save settings on plugin destruction
cerf [Fri, 3 Jun 2011 09:30:42 +0000 (11:30 +0200)]
Bazaar: save settings on plugin destruction

Change-Id: I94d5c1f1944b51a284e41ad9be0168f3edc99292
Merge-request: 345
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/462
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoS60RunControl: Fix gcc warning
Kai Koehne [Fri, 10 Jun 2011 15:24:11 +0000 (17:24 +0200)]
S60RunControl: Fix gcc warning

Change-Id: I5cb1adbdbb5dbd457e5609997eeb9fae74813141
Reviewed-on: http://codereview.qt.nokia.com/461
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
13 years agoQmlProfiler: set clip in timelineview
Christiaan Janssen [Fri, 10 Jun 2011 14:21:10 +0000 (16:21 +0200)]
QmlProfiler: set clip in timelineview

Otherwise the user can mouseover events that are not displayed.

Change-Id: I8108cfbf730708bbad4a6d2cc812ee1b3a1a444a
Reviewed-on: http://codereview.qt.nokia.com/457
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlProfiler: start timeline at 0
Christiaan Janssen [Fri, 10 Jun 2011 14:19:10 +0000 (16:19 +0200)]
QmlProfiler: start timeline at 0

Change-Id: Id42f2dd156863c8cfa19ce27f03b862c512b6b57
Reviewed-on: http://codereview.qt.nokia.com/456
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoQmlProfiler: skip computing fps when not going to display them
Christiaan Janssen [Fri, 10 Jun 2011 14:18:34 +0000 (16:18 +0200)]
QmlProfiler: skip computing fps when not going to display them

Change-Id: I808f8a3b1cb6243f7df40bb1747d9ca92fb80380
Reviewed-on: http://codereview.qt.nokia.com/455
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoFix makefile location check for qmakestep
dt_ [Fri, 10 Jun 2011 14:43:05 +0000 (16:43 +0200)]
Fix makefile location check for qmakestep

Change-Id: Idf1842be4f8d7fe62b1569845b3f70ad1da32abd
Task-Nr: QTCREATORBUG-5127
Reviewed-on: http://codereview.qt.nokia.com/459
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoKeep the old name on editing qt versions
dt_ [Fri, 10 Jun 2011 14:06:00 +0000 (16:06 +0200)]
Keep the old name on editing qt versions

Change-Id: I80782e8256360f944a09f77de5da30884adccffa
Task-Nr: QTCREATORBUG-5126
Reviewed-on: http://codereview.qt.nokia.com/454
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoOn editing qmake, start in a sane directory
dt_ [Fri, 10 Jun 2011 14:05:02 +0000 (16:05 +0200)]
On editing qmake, start in a sane directory

Change-Id: I3d10946c50482bc8ec0e166bf6ea92bde2822f63
Task-Nr: QTCREATORBUG-5125
Reviewed-on: http://codereview.qt.nokia.com/453
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
13 years agoSymbian: TRK is no more!
Pawel Polanski [Thu, 9 Jun 2011 12:45:08 +0000 (14:45 +0200)]
Symbian: TRK is no more!

TKR-related code has been removed.
From now on CODA is the default On-Device
Agent

Change-Id: I52236a33aff9b31ca48d507da97430df7d871239
Reviewed-on: http://codereview.qt.nokia.com/450
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
13 years agovcsbase: make settings mutable inside VCSBaseClient
cerf [Fri, 10 Jun 2011 14:02:46 +0000 (14:02 +0000)]
vcsbase: make settings mutable inside VCSBaseClient

VCSBaseClient takes now a pointer to VCSBaseClientSettings, so settings
can be changed within the VCS client. For example diff settings can now
be loaded and saved from within the VCS client.
This impacts the Bazaar and Mercurial plugins

Change-Id: I84882b1f3355e0ca2597704f48f589dca42fd661
Merge-request: 344
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoQmlProfiler: Support profiling via CODA on Symbian
Kai Koehne [Thu, 9 Jun 2011 12:34:26 +0000 (14:34 +0200)]
QmlProfiler: Support profiling via CODA on Symbian

Change-Id: I44be1a67c95814a78c82b17e991e5e3a722a63c8
Reviewed-by: Christiaan Janssen
Reviewed-on: http://codereview.qt.nokia.com/428
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
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>