OSDN Git Service

qt-creator-jp/qt-creator-jp.git
12 years agoDoc: cannot specify a folder as a dependency
Leena Miettinen [Tue, 27 Sep 2011 14:42:37 +0000 (16:42 +0200)]
Doc: cannot specify a folder as a dependency

Change-Id: I3f3ac0c2cabb7b660ff6ab8646563190df29c499
Reviewed-on: http://codereview.qt-project.org/5639
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoGen. highlighter: Manager refactor and pending issues fixes
Leandro Melo [Tue, 27 Sep 2011 14:09:15 +0000 (16:09 +0200)]
Gen. highlighter: Manager refactor and pending issues fixes

Some renamings for better clarity and re-structure how the gathering of definitions
is done. There where issues concerning mainly synchronization. Also make control
over the future interface better.

Change-Id: I5a51a391106872acd75d84cea4bcf7e9d7495a6d
Reviewed-on: http://codereview.qt-project.org/5636
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agoa simple 'new project' wizard for a plain C project
hjk [Fri, 23 Sep 2011 15:09:23 +0000 (17:09 +0200)]
a simple 'new project' wizard for a plain C project

Change-Id: Ie3102362af67858790ff3121d2db56a7183906d4
Reviewed-on: http://codereview.qt-project.org/5468
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoDoc: move info about Qt Designer and Qt widgets to a separate folder
Leena Miettinen [Tue, 27 Sep 2011 09:59:26 +0000 (11:59 +0200)]
Doc: move info about Qt Designer and Qt widgets to a separate folder

Change-Id: I92efa66d0dc1f8ed35e16f7f8b5293806355a400
Reviewed-on: http://codereview.qt-project.org/5614
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: move info about Symbian target to a separate folder
Leena Miettinen [Tue, 27 Sep 2011 09:58:46 +0000 (11:58 +0200)]
Doc: move info about Symbian target to a separate folder

Change-Id: I93db9d03057f9f80a041447f41eefe98f8b4c41c
Reviewed-on: http://codereview.qt-project.org/5613
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: move Qt Quick topics to a separate folder
Leena Miettinen [Tue, 27 Sep 2011 09:56:42 +0000 (11:56 +0200)]
Doc: move Qt Quick topics to a separate folder

Change-Id: I020cb65cc343f933bea925de368f09c9c4f7b879
Reviewed-on: http://codereview.qt-project.org/5612
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: move projects mode topics to a separate folder
Leena Miettinen [Tue, 27 Sep 2011 09:55:44 +0000 (11:55 +0200)]
Doc: move projects mode topics to a separate folder

Change-Id: I031e1f488c4923baea0bddbd24da804f3bb01c95
Reviewed-on: http://codereview.qt-project.org/5611
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoDoc: move misc overview topics to a separate folder
Leena Miettinen [Tue, 27 Sep 2011 09:54:44 +0000 (11:54 +0200)]
Doc: move misc overview topics to a separate folder

Change-Id: I7bcf4edb2e23c669b000e08a1d6ce14b3982fd0d
Reviewed-on: http://codereview.qt-project.org/5610
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: move misc howto topics to a separate folder
Leena Miettinen [Tue, 27 Sep 2011 09:53:38 +0000 (11:53 +0200)]
Doc: move misc howto topics to a separate folder

Change-Id: I586e3abfbfd578157fc41e3e82fa174494dfdfe9
Reviewed-on: http://codereview.qt-project.org/5609
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: move edit mode topics to a separate folder
Leena Miettinen [Tue, 27 Sep 2011 09:52:48 +0000 (11:52 +0200)]
Doc: move edit mode topics to a separate folder

Change-Id: I4c16db20988ddb07e07730d55d205bc3614b2699
Reviewed-on: http://codereview.qt-project.org/5608
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: move debugger mode topics to a separate folder
Leena Miettinen [Tue, 27 Sep 2011 09:52:34 +0000 (11:52 +0200)]
Doc: move debugger mode topics to a separate folder

Change-Id: I3cef398cabb8d8961507a6208076991c7f407ac6
Reviewed-on: http://codereview.qt-project.org/5607
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: make qtcreator.qdoc a TOC file, only
Leena Miettinen [Tue, 27 Sep 2011 09:51:32 +0000 (11:51 +0200)]
Doc: make qtcreator.qdoc a TOC file, only

Change-Id: I73b7cccd98b461485f9f0b10817be6d51295778c
Reviewed-on: http://codereview.qt-project.org/5605
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: move info about Linux targets to doc/src/linux-mobile folder
Leena Miettinen [Tue, 27 Sep 2011 09:50:21 +0000 (11:50 +0200)]
Doc: move info about Linux targets to doc/src/linux-mobile folder

Change-Id: Id9cccd999698e89c8b372f398e5e2755172ca644
Reviewed-on: http://codereview.qt-project.org/5604
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: move analyze mode topics to a separate folder
Leena Miettinen [Tue, 27 Sep 2011 09:52:15 +0000 (11:52 +0200)]
Doc: move analyze mode topics to a separate folder

Change-Id: I4fd791c42003c7fcf9b75ff5c7dee01b0115e3aa
Reviewed-on: http://codereview.qt-project.org/5606
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: add and edit macros to remove emphasis for product names
Leena Miettinen [Tue, 27 Sep 2011 09:21:55 +0000 (11:21 +0200)]
Doc: add and edit macros to remove emphasis for product names

Change-Id: I077c721c661a2b9fa8dfbd93dd9888a8d700f5c5
Reviewed-on: http://codereview.qt-project.org/5603
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: change doc configuration after moving files to subdirectories
Leena Miettinen [Tue, 27 Sep 2011 09:21:21 +0000 (11:21 +0200)]
Doc: change doc configuration after moving files to subdirectories

Change-Id: I6df3222a92efed43ede601e3f2e6f71b75782d22
Reviewed-on: http://codereview.qt-project.org/5602
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoSquish: Remove also versioned .user files
Christian Stenger [Tue, 27 Sep 2011 09:39:01 +0000 (11:39 +0200)]
Squish: Remove also versioned .user files

Change-Id: Icf4325930f5e1bd908fef9cbd87658b4cc8fc110
Reviewed-on: http://codereview.qt-project.org/5601
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
12 years agoQmlJS: Fix crash.
Christian Kamm [Tue, 27 Sep 2011 11:49:20 +0000 (13:49 +0200)]
QmlJS: Fix crash.

Change-Id: Ieacc7896eaeb478c6bd79a0865280f0cb595101e
Reviewed-on: http://codereview.qt-project.org/5619
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agodebugger: disable "set target-async on"
hjk [Mon, 26 Sep 2011 16:43:26 +0000 (18:43 +0200)]
debugger: disable "set target-async on"

Has a tendency to crash gdb, at least release 7.3.1 and today's cvs.

Change-Id: Iba42891ddad000bf97b45d5daf8985d48d4fd977
Reviewed-on: http://codereview.qt-project.org/5617
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoSquish: Some smaller refactorings
Christian Stenger [Mon, 26 Sep 2011 13:24:49 +0000 (15:24 +0200)]
Squish: Some smaller refactorings

Change-Id: I5f8b5ec982e8a38d32ba15d81317c2308dc00106
Reviewed-on: http://codereview.qt-project.org/5544
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
12 years agoSquish: Starting test cases only if needed files are present
Robert Loehning [Tue, 27 Sep 2011 09:04:12 +0000 (11:04 +0200)]
Squish: Starting test cases only if needed files are present

Change-Id: I41a73ce1a4f0d0578cf59af5c69fc19f9ec11dd9
Reviewed-on: http://codereview.qt-project.org/5555
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoqttest: Incremental improvement to the tests scanning logic.
Shane Bradley [Wed, 21 Sep 2011 05:25:09 +0000 (15:25 +1000)]
qttest: Incremental improvement to the tests scanning logic.

This should fix (or reduce the chance of) the crashing issue
when opening a large project, and make the UI remain responsive.

Task-number: QTCREATORBUG-5991
Change-Id: I29c652794600460e3170bbf25b5847adcc9209ef
Reviewed-on: http://codereview.qt-project.org/5431
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoL10n: First German translation for 2.4 except QtTest, purged.
Friedemann Kleint [Tue, 27 Sep 2011 07:40:42 +0000 (09:40 +0200)]
L10n: First German translation for 2.4 except QtTest, purged.

Change-Id: I4351643ae55dd15a48021d35792f07e040f1c721
Reviewed-on: http://codereview.qt-project.org/5599
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agotr()-Fixes for 2.4.
Friedemann Kleint [Tue, 27 Sep 2011 07:38:53 +0000 (09:38 +0200)]
tr()-Fixes for 2.4.

Change-Id: Ieee648b38687a1d8e88ab1ddf887f2f5908aaa05
Reviewed-on: http://codereview.qt-project.org/5597
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQmlJS: Fix typo in building string uris.
Christian Kamm [Tue, 27 Sep 2011 07:31:24 +0000 (09:31 +0200)]
QmlJS: Fix typo in building string uris.

Change-Id: I94421816f4bd30591925be42d7d386fac589e832
Reviewed-on: http://codereview.qt-project.org/5595
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
12 years agoQmlJS: Fix threading issue in QmlObjectValue.
Christian Kamm [Mon, 26 Sep 2011 13:07:12 +0000 (15:07 +0200)]
QmlJS: Fix threading issue in QmlObjectValue.

Still need to get rid of the lock in ValueOwner::registerValue.

Change-Id: If9bbc548de54edf52805906aaaf730f5c66573dd
Reviewed-on: http://codereview.qt-project.org/5542
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agoSquish: Using native directory separators on Windows
Robert Loehning [Mon, 26 Sep 2011 14:58:39 +0000 (16:58 +0200)]
Squish: Using native directory separators on Windows

Change-Id: I8ecf6a8798526b9d9dd0909b9c7e4f61d00d530e
Reviewed-on: http://codereview.qt-project.org/5552
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
12 years agoCompile fix
Leandro Melo [Mon, 26 Sep 2011 14:57:31 +0000 (16:57 +0200)]
Compile fix

Change-Id: I1f2a0ef6ab0eae28d1e830107af213df89573aaf
Reviewed-on: http://codereview.qt-project.org/5551
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agotr()-Fixes for 2.4
Friedemann Kleint [Mon, 26 Sep 2011 14:48:54 +0000 (16:48 +0200)]
tr()-Fixes for 2.4

Change-Id: I151e75ebec7bff17a3779f1b367849ca514512c6
Reviewed-on: http://codereview.qt-project.org/5550
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoEditor: Make ui text clearer for matching characters
Leandro Melo [Mon, 26 Sep 2011 13:19:41 +0000 (15:19 +0200)]
Editor: Make ui text clearer for matching characters

Change-Id: I23a5dd090fd37cd645fba3fde83f56b8c9ac1f7a
Reviewed-on: http://codereview.qt-project.org/5545
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemoteLinux: Make custom command deployment step extensible.
Christian Kandeler [Mon, 26 Sep 2011 14:03:07 +0000 (16:03 +0200)]
RemoteLinux: Make custom command deployment step extensible.

Also fix typo in service class name.

Change-Id: Icd664d77b43fc63a59a94575529b1a1c272b500c
Reviewed-on: http://codereview.qt-project.org/5549
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoQt4ProjectManager: Export Qt4Manager.
Christian Kandeler [Mon, 26 Sep 2011 13:17:55 +0000 (15:17 +0200)]
Qt4ProjectManager: Export Qt4Manager.

Change-Id: I4de9f5b0cdda0065f415b6d4e915343bd49fad14
Reviewed-on: http://codereview.qt-project.org/5543
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoReduce height of tab settings.
Eike Ziller [Fri, 23 Sep 2011 13:37:08 +0000 (15:37 +0200)]
Reduce height of tab settings.

Task-number: QTCREATORBUG-3172

Change-Id: I73f9aa595e9d435d50095a3df2f48384ff70bf3a
Reviewed-on: http://codereview.qt-project.org/5461
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agoProjectExplorer: Introduce shared settings support
Leandro Melo [Thu, 15 Sep 2011 13:44:49 +0000 (15:44 +0200)]
ProjectExplorer: Introduce shared settings support

Continuing the series... This patch is the one that actually
introduces the shared settings support. They are stored in a
.shared file. Details on how to make settings shared and how
the overall mechanism works are documented in the code.

Notice that currently no setting is actually shared yet. Those
should go into separate commits.

Change-Id: I53cc6b4e96d836b00faa422ef358103bd5065bae
Reviewed-on: http://codereview.qt-project.org/5083
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
12 years agoProjectExplorer: Rename userfileacessor.* to settingsacessor.*
Leandro Melo [Fri, 16 Sep 2011 10:57:37 +0000 (12:57 +0200)]
ProjectExplorer: Rename userfileacessor.* to settingsacessor.*

So the file name matches the class names. Continuing the series
from the previous commit...

Change-Id: I86460f553371bdb09c2b404079f4601b1f25cf42
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/5082
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agoProjectExplorer: Refactor file settings acessor
Leandro Melo [Thu, 15 Sep 2011 09:32:15 +0000 (11:32 +0200)]
ProjectExplorer: Refactor file settings acessor

This is the first patch of a series. The final goal is to introduce
shared settings into Creator.

This particular patch shouldn't affect functionality, but it changes
a bit the design of the settings acessor and prepares the code for
the upcoming commits.

In addition it also makes restoring the settings slightly more
robust, since it will try to load a compatible "old" file from the
quick check before it actually performs the more expensive check.

NOTE: Files userfileacessor.* will be renamed in a following
commit to settingsacessor.*. It's not done right now because I
think it will make the review easier on gerrit.

Reviewed-by: Tobias Hunger
Change-Id: I950c813936afb6c55c770e0d6f061eb27b37c47b
Reviewed-on: http://codereview.qt-project.org/5081
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agoEditor: Keyboard option for overriding delete word's start/end
Leandro Melo [Mon, 26 Sep 2011 12:21:19 +0000 (14:21 +0200)]
Editor: Keyboard option for overriding delete word's start/end

Regular and camel-case version.

Task-number: QTCREATORBUG-5160
Change-Id: I749fbc4c768d4f11fb741fd1b9d00ddee56eb965
Reviewed-on: http://codereview.qt-project.org/5537
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
12 years agoRemove qmake warning
Eike Ziller [Mon, 26 Sep 2011 12:34:19 +0000 (14:34 +0200)]
Remove qmake warning

Change-Id: I2514a2c3a5f26ec5ae3ef2f5808353c7b3e0aed8
Reviewed-on: http://codereview.qt-project.org/5538
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoAllow usage of keypad 'enter' key for initiating searches.
Eike Ziller [Mon, 26 Sep 2011 12:49:27 +0000 (14:49 +0200)]
Allow usage of keypad 'enter' key for initiating searches.

Change-Id: Ida418646a35c51cc848abfeb8fd598f13d56b7dc
Reviewed-on: http://codereview.qt-project.org/5541
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoImproved testing of id renaming.
Christian Stenger [Mon, 26 Sep 2011 10:59:55 +0000 (12:59 +0200)]
Improved testing of id renaming.

Change-Id: If1312fdbd9f8c934b8412289ede457032131fc42
Reviewed-on: http://codereview.qt-project.org/5533
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
12 years agodebugger: hack to specify sysroot in generic remote linux
hjk [Mon, 26 Sep 2011 10:38:17 +0000 (12:38 +0200)]
debugger: hack to specify sysroot in generic remote linux

Change-Id: I9657f71246df4742329a0b4f27bf08f146e9632a
Reviewed-on: http://codereview.qt-project.org/5534
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoC++ function signature: Abort on unexpected function name.
Christian Kamm [Wed, 21 Sep 2011 12:39:48 +0000 (14:39 +0200)]
C++ function signature: Abort on unexpected function name.

Change-Id: Iaaa3907f709ea9ed567f59725399efd9024f3bc0
Reviewed-on: http://codereview.qt-project.org/5319
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agobaseqtversion: less inverted logic
hjk [Fri, 23 Sep 2011 15:29:45 +0000 (17:29 +0200)]
baseqtversion: less inverted logic

Change-Id: I3a11dbe604a5624a29164308fd69bf00b223995d
Reviewed-on: http://codereview.qt-project.org/5471
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoSquish: Improved path constants
Robert Loehning [Fri, 23 Sep 2011 18:40:57 +0000 (20:40 +0200)]
Squish: Improved path constants

Renamed the old constant SDKPath to srcPath because this is where sources are.
Added new constant sdkPath for the root directory of the Qt SDK installation.

Change-Id: I1b1f346554f58629a9d1882f90250f21708e4d22
Reviewed-on: http://codereview.qt-project.org/5474
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
12 years agoRemoved unused function
Robert Loehning [Tue, 13 Sep 2011 10:40:10 +0000 (12:40 +0200)]
Removed unused function

Usage of mapDeviceToDriveLetter(QString *) was being removed in c5a40e9e63

Change-Id: I4b0ba6f0b26df4997a9ed24cc06d9cc6da3eedc9
Reviewed-on: http://codereview.qt-project.org/4761
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoMake MaemoInstallToSysRootStep thread safe
Daniel Teske [Thu, 22 Sep 2011 13:30:57 +0000 (15:30 +0200)]
Make MaemoInstallToSysRootStep thread safe

Change-Id: Id83e93c94af1499476868603ba654a278da6ff38
Reviewed-on: http://codereview.qt-project.org/5453
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoQmlJS: Update Qt 5 builtin type information.
Christian Kamm [Wed, 21 Sep 2011 10:45:19 +0000 (12:45 +0200)]
QmlJS: Update Qt 5 builtin type information.

Change-Id: I5eab75a46c2c0ab167e14841992a7187eb37bdfd
Reviewed-on: http://codereview.qt-project.org/5310
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agoQmlJS: Separate metaObjectRevision from minor version number.
Christian Kamm [Wed, 21 Sep 2011 10:42:27 +0000 (12:42 +0200)]
QmlJS: Separate metaObjectRevision from minor version number.

They need not to be identical. Additionally:
* Rename ImportInfo::name to path, because that's what it does.
* Add ImportInfo::name, for getting the uri with the names
  separated by dots.
* Allow for exportMetaObjectRevisions in qmltypes files.
* Allow for exports with an empty type name, as generated by
  qmlRegisterRevision. They are used for associating meta object
  revisions with non-exported types.
* Rewrite the Qt 4.7 import to QtQuick 1.0 at an early stage. In
  preparation for the Qt 5 type information update, where Qt 4.7
  is gone.

Change-Id: Ia287193623d9530a56b9eb8d2481d50aabd94c3e
Reviewed-on: http://codereview.qt-project.org/5309
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
12 years agoRemoteLinux: Make GenericDirectUploadService extensible.
Christian Kandeler [Mon, 26 Sep 2011 09:16:03 +0000 (11:16 +0200)]
RemoteLinux: Make GenericDirectUploadService extensible.

Change-Id: I461358e87a5d895e904d01c837f27befca85560c
Reviewed-on: http://codereview.qt-project.org/5530
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoCreate definition is available on the whole declaration line.
Nicolas Arnaud-Cormos [Mon, 26 Sep 2011 08:51:13 +0000 (10:51 +0200)]
Create definition is available on the whole declaration line.

Merge-request: 390
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Change-Id: I046b3046d3d0148b0fad694181f17737e12a85b6
Reviewed-on: http://codereview.qt-project.org/5529
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
12 years agoRemoteLinux: Add "custom command" deployment step.
Christian Kandeler [Fri, 23 Sep 2011 15:39:33 +0000 (17:39 +0200)]
RemoteLinux: Add "custom command" deployment step.

It might be useful for developers to run a command before or after
uploading or even have a remote command *be* the "deployment" step.
Also: Stop trying to display the "deployment possible" state in the
widget. It's generally hard to do that correctly and it also interferes
with thread safety.

Change-Id: I28aaf368a645ee14156a165c606dbc17c3063e82
Reviewed-on: http://codereview.qt-project.org/5469
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoAnalyzer: Make sure right tool is shown when triggered via menu
Kai Koehne [Fri, 23 Sep 2011 15:04:51 +0000 (17:04 +0200)]
Analyzer: Make sure right tool is shown when triggered via menu

Selecting a tool via menu while the Analyze mode is active resulted
in the wrong 'default' tool being selected when the tool finally
forces a switch to Analyze mode. This fixes it by switching to
Analyze mode first -> default tool is shown -> selected tool is shown.

Change-Id: I36e770c932b9c13552dc3604db58837a89d637b6
Reviewed-on: http://codereview.qt-project.org/5466
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agodebugger: more robust port number parsing
hjk [Thu, 22 Sep 2011 14:04:07 +0000 (16:04 +0200)]
debugger: more robust port number parsing

Change-Id: I78edf9faa977af8a52e3e712b06ab14785af838a
Reviewed-on: http://codereview.qt-project.org/5465
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoFix extensionsystem auto test on windows.
con [Fri, 23 Sep 2011 12:37:55 +0000 (14:37 +0200)]
Fix extensionsystem auto test on windows.

Task-number: QTCREATORBUG-6006

Change-Id: I9e7caa83feba56561760b627b44de880bad6cab1
Reviewed-on: http://codereview.qt-project.org/5459
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
12 years agoToolchain: Allow all tool chains
Tobias Hunger [Thu, 15 Sep 2011 11:30:54 +0000 (13:30 +0200)]
Toolchain: Allow all tool chains

Allow all tool chains if either the Qt version is invalid or
no Qt modules are not selected.

Change-Id: I9842c30aca0a8752915548dc258f257c3fd39e4d
Reviewed-on: http://codereview.qt-project.org/4990
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoFix typo
Tobias Hunger [Fri, 23 Sep 2011 11:57:11 +0000 (11:57 +0000)]
Fix typo

Change-Id: I96e403cde9c8d3a59e6a5008550df2d9fe697b5d
Reviewed-on: http://codereview.qt-project.org/5457
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
12 years agoMake Qt4ProjectManager::QMakeStep mulithreading safe
Daniel Teske [Thu, 22 Sep 2011 11:36:46 +0000 (13:36 +0200)]
Make Qt4ProjectManager::QMakeStep mulithreading safe

Change-Id: I41abb5e7138351e61c6c9dfc87121837edb21fbe
Reviewed-on: http://codereview.qt-project.org/5452
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoMake Qt4ProejctManager::MakeStep::run multithreading safe
Daniel Teske [Thu, 22 Sep 2011 10:59:31 +0000 (12:59 +0200)]
Make Qt4ProejctManager::MakeStep::run multithreading safe

Change-Id: I416360d35681d2721878cb9fefd861d6e1f209b4
Reviewed-on: http://codereview.qt-project.org/5451
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoRemove unused member
Daniel Teske [Thu, 22 Sep 2011 10:51:10 +0000 (12:51 +0200)]
Remove unused member

Change-Id: Icb404090885619f76a0a34861da8474c0f16571d
Reviewed-on: http://codereview.qt-project.org/5450
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoRemove unused member
Daniel Teske [Thu, 22 Sep 2011 10:50:42 +0000 (12:50 +0200)]
Remove unused member

Change-Id: I0e937203eaf95db76fb1f432b7706c7bb560a789
Reviewed-on: http://codereview.qt-project.org/5449
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoImplement Code Style schemes
Jarek Kobus [Tue, 16 Aug 2011 08:45:23 +0000 (10:45 +0200)]
Implement Code Style schemes

Task-number: QTCREATORBUG-5092

Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agoMove wizards' cancel button to the left on Mac.
Eike Ziller [Thu, 22 Sep 2011 16:02:43 +0000 (18:02 +0200)]
Move wizards' cancel button to the left on Mac.

It is too far to the left now, but that can't be helped
(it's a Qt limitation).

Task-number: QTCREATORBUG-6156
Change-Id: I0201356234abb618dc3b573673d512c0a97c4839
Reviewed-on: http://codereview.qt-project.org/5406
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoReduce vertical minimum size of Qt versions settings.
Eike Ziller [Wed, 21 Sep 2011 13:17:24 +0000 (15:17 +0200)]
Reduce vertical minimum size of Qt versions settings.

The main point of the change is to hide the version info while the
details for the helpers are shown.

Change-Id: I02166674d2339a585fda0eebe643289471ca139c
Reviewed-on: http://codereview.qt-project.org/5325
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoRemoteLinux: Deployment improvements.
Christian Kandeler [Thu, 22 Sep 2011 15:37:05 +0000 (17:37 +0200)]
RemoteLinux: Deployment improvements.

- Don't depend on the order of signal connections when updating the
deploy step label.
- Give a meaningful error message when the init() function fails.
- Don't try to upload files that don't have a target path set.

Change-Id: If302cf8407b69faf8507579267afde7428edf704
Reviewed-on: http://codereview.qt-project.org/5404
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoAdded new qml test and continue refactoring
Christian Stenger [Wed, 21 Sep 2011 15:29:18 +0000 (17:29 +0200)]
Added new qml test and continue refactoring

Refactoring of all helper functions to make it easier to
recognize them as such. All helper functions in global
shared scripts now follow the scheme __NAME__
Helper functions normally should not get called from outside.

Change-Id: I0d02028d3f9de1ad251af9226c0460655bd9c9bd
Reviewed-on: http://codereview.qt-project.org/5331
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
12 years agoABI: Add sh architecture
Tobias Hunger [Thu, 22 Sep 2011 14:26:10 +0000 (14:26 +0000)]
ABI: Add sh architecture

* incl. unit test

Change-Id: Id56f713104cf05cb25fc788fa8b06a9df90b417b
Reviewed-on: http://codereview.qt-project.org/5398
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
12 years agoRemoteLinux: Fix remote processes listing.
Christian Kandeler [Thu, 22 Sep 2011 14:16:10 +0000 (16:16 +0200)]
RemoteLinux: Fix remote processes listing.

There were nul character conversion problems, resulting in display
artifacts.

Change-Id: Ia012d18c942e6b31029054a1574c04e0c3d182b7
Reviewed-on: http://codereview.qt-project.org/5397
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoMadde: Remove unneeded image.
Christian Kandeler [Thu, 22 Sep 2011 12:19:08 +0000 (14:19 +0200)]
Madde: Remove unneeded image.

Change-Id: Id0273bd7d8458292f0e8df6a9a65325b1350bdda
Reviewed-on: http://codereview.qt-project.org/5396
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agoEditor: Unindent backpace mode should not apply for parag. separators
Leandro Melo [Thu, 22 Sep 2011 13:17:08 +0000 (15:17 +0200)]
Editor: Unindent backpace mode should not apply for parag. separators

QChar:isSpace also includes paragraph separator, for which the backspace
behavior should be the normal one.

Change-Id: I80c362a4e11b436259f85fea4c73de874fc64249
Reviewed-on: http://codereview.qt-project.org/5389
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoremotelinux: compile fix
hjk [Thu, 22 Sep 2011 13:42:02 +0000 (15:42 +0200)]
remotelinux: compile fix

Qt 4.7's uic does not seem to understand everything that 4.8's uic accepts.

Change-Id: I550d63655584f974000bdab7dc34bec42792366c
Reviewed-on: http://codereview.qt-project.org/5391
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
12 years agodebugger/remote linux: add dialog to start gdbserver on the device
hjk [Thu, 22 Sep 2011 09:18:14 +0000 (11:18 +0200)]
debugger/remote linux: add dialog to start gdbserver on the device

Change-Id: I57ddfa17a7c51a9347b0d81205c1679c6398d126
Reviewed-on: http://codereview.qt-project.org/5383
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoRemoteLinux: Fix plugin deployment.
Christian Kandeler [Wed, 21 Sep 2011 12:46:10 +0000 (14:46 +0200)]
RemoteLinux: Fix plugin deployment.

No symbolic links are being created for those.

Change-Id: Icecd7441626cc3862bad6c2d4ab000c2f060ec52
Reviewed-on: http://codereview.qt-project.org/5320
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
12 years agoIntroduce new "Madde" plugin.
Christian Kandeler [Tue, 20 Sep 2011 10:16:36 +0000 (12:16 +0200)]
Introduce new "Madde" plugin.

The new plugin contains everything specific to Maemo and MeeGo
as supported by the MADDE framework.
This leaves the RemoteLinux plugin with abstract base classes and
generic implementations.

Change-Id: I6068caa758214cf26a27fe9893e0817b7834b580
Reviewed-on: http://codereview.qt-project.org/5230
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
12 years agoDebugger: Show QML Script Console only for QML debugging
Aurindam Jana [Wed, 21 Sep 2011 14:39:45 +0000 (16:39 +0200)]
Debugger: Show QML Script Console only for QML debugging

Change-Id: Ibb0f03c77a84ee8682d44944e8a24fac54cb60fe
Reviewed-on: http://codereview.qt-project.org/5329
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoProjectExplorer: On shutdown, delete runcontrols before singnaling done.
Daniel Teske [Tue, 20 Sep 2011 14:49:02 +0000 (16:49 +0200)]
ProjectExplorer: On shutdown, delete runcontrols before singnaling done.

Change-Id: I6860465e575b6751d804304377c16a513c24f20d
Reviewed-on: http://codereview.qt-project.org/5248
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agodebugger: add option to search debug info in well-known locations
hjk [Thu, 22 Sep 2011 07:30:50 +0000 (09:30 +0200)]
debugger: add option to search debug info in well-known locations

Change-Id: I16e32f0e44fc628c7dca5270083a9bb1050769c1
Reviewed-on: http://codereview.qt-project.org/5371
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoQmlJS: Only try qmldump on Desktop and Simulator Qt.
Christian Kamm [Wed, 21 Sep 2011 13:54:07 +0000 (15:54 +0200)]
QmlJS: Only try qmldump on Desktop and Simulator Qt.

In particular, don't complain about a missing qmldump binary on other
platforms.

Change-Id: Ie2e96bcb67e609aa5aed31510b06139d2d9ce77e
Reviewed-on: http://codereview.qt-project.org/5327
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agoUpdate versions to be more inline with latest SDK install.
Bill King [Wed, 21 Sep 2011 09:32:33 +0000 (11:32 +0200)]
Update versions to be more inline with latest SDK install.

Change-Id: I646d68208b0706664a3ffeb9c4f51547af9cc782
Reviewed-on: http://codereview.qt-project.org/5300
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
12 years agoFixes: Pressing return in search panel didn't run the search.
Eike Ziller [Tue, 20 Sep 2011 15:23:05 +0000 (17:23 +0200)]
Fixes: Pressing return in search panel didn't run the search.

It did so only if the focus was on the search term line edit.

Task-number: QTCREATORBUG-6114
Change-Id: I0cf051ed0f5f4e7403d7c36eb2173a71de370276
Reviewed-on: http://codereview.qt-project.org/5252
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
12 years agoCleanup to use new waitForSignal function.
Bill King [Wed, 21 Sep 2011 11:55:23 +0000 (13:55 +0200)]
Cleanup to use new waitForSignal function.

Change-Id: Id47c81fc3c2d4448f26dd2432b73286501be1e26
Reviewed-on: http://codereview.qt-project.org/5297
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
12 years agoMore sensible options (with fallback)
Bill King [Wed, 21 Sep 2011 09:30:22 +0000 (11:30 +0200)]
More sensible options (with fallback)

Change-Id: I32afb2ed7e690d3dfc9b2ba47d2007d03d29d2cb
Reviewed-on: http://codereview.qt-project.org/5299
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
12 years agoShift temp dir into more findable location.
Bill King [Wed, 21 Sep 2011 09:29:21 +0000 (11:29 +0200)]
Shift temp dir into more findable location.

Change-Id: Idbf29e79d4a3dc7c4083a5b7cba78489db46366b
Reviewed-on: http://codereview.qt-project.org/5298
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
12 years agoC++ indenter: Fix preserving indent in comments with tabs.
Christian Kamm [Wed, 21 Sep 2011 11:39:48 +0000 (13:39 +0200)]
C++ indenter: Fix preserving indent in comments with tabs.

Task-number: QTCREATORBUG-6151
Change-Id: I584666441dce05af9a91cd28812b230c36bdd830
Reviewed-on: http://codereview.qt-project.org/5318
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
12 years agos/error_message/errorMessage/g
hjk [Wed, 21 Sep 2011 11:05:15 +0000 (13:05 +0200)]
s/error_message/errorMessage/g

Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoreplace 'QMake Console' with 'Plain C++'
hjk [Wed, 21 Sep 2011 10:02:56 +0000 (12:02 +0200)]
replace 'QMake Console' with 'Plain C++'

Change-Id: I26b29ce0e62e6470629117ff21412a4cfbe74488
Reviewed-on: http://codereview.qt-project.org/5306
Reviewed-by: hjk <qthjk@ovi.com>
12 years agofix string in 'qmake console' wizard
hjk [Wed, 21 Sep 2011 09:55:59 +0000 (11:55 +0200)]
fix string in 'qmake console' wizard

Change-Id: I0cf1b405b9df2af681c87f1636d3457afba0d86e
Reviewed-on: http://codereview.qt-project.org/5305
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoCreates a pure console project using QMake, not using Qt library.
Yuchen Deng [Wed, 21 Sep 2011 09:48:20 +0000 (11:48 +0200)]
Creates a pure console project using QMake, not using Qt library.

Merge-request: 386
Reviewed-by: hjk <qtc-committer@nokia.com>
Change-Id: I1292faa757d7974eb35c1d463d75bc53f8044c41
Reviewed-on: http://codereview.qt-project.org/5304
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoBazaar: fix whitespaces
cerf [Wed, 21 Sep 2011 09:43:58 +0000 (11:43 +0200)]
Bazaar: fix whitespaces

Merge-request: 2208
Reviewed-by: hjk <qtc-committer@nokia.com>
Change-Id: I4f803ebe6bfc4eda5635c1ee60d7c049d8c70250
Reviewed-on: http://codereview.qt-project.org/5302
Reviewed-by: hjk <qthjk@ovi.com>
12 years agodebugger: manual test, add QT += core-private for Qt 5
hjk [Wed, 21 Sep 2011 09:41:20 +0000 (11:41 +0200)]
debugger: manual test, add QT += core-private for Qt 5

Change-Id: I938f926ed78c33c1feb74bcd2f6c850b31241e46
Reviewed-on: http://codereview.qt-project.org/5301
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoQmlJS: Lexer apply fix from Qt5.
Christian Kamm [Wed, 21 Sep 2011 08:29:21 +0000 (10:29 +0200)]
QmlJS: Lexer apply fix from Qt5.

Change-Id: Ic11e6bad2868f56b5d7c2c063b72fb3d25c5417f
Reviewed-on: http://codereview.qt-project.org/5294
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoReduce size of general project settings
Eike Ziller [Tue, 20 Sep 2011 10:44:11 +0000 (12:44 +0200)]
Reduce size of general project settings

Part of a series of commits reducing the (vertical) size of the
preferences dialog.

Task-number: QTCREATORBUG-3172
Change-Id: I1f55607f8ee2e56e86098ba1700fb01671d8965b
Reviewed-on: http://codereview.qt-project.org/5234
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoConsistent names for AbstractGeneratedFileInfo::FileType keys
Alessandro Portale [Tue, 13 Sep 2011 17:21:52 +0000 (19:21 +0200)]
Consistent names for AbstractGeneratedFileInfo::FileType keys

Change-Id: I619873dac7fe67209f9cc2128945cda080e2e6a0
Reviewed-on: http://codereview.qt-project.org/4828
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
12 years agoremove superfluous semicolon from test wizard's output
Joerg Bornemann [Fri, 8 Jul 2011 06:12:39 +0000 (08:12 +0200)]
remove superfluous semicolon from test wizard's output

Change-Id: Id7d5a448c520f3000f686389e50b781bed98b205
Reviewed-on: http://codereview.qt-project.org/1345
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoadd some example with statistics on the impact of using small classes
hjk [Tue, 20 Sep 2011 15:50:45 +0000 (17:50 +0200)]
add some example with statistics on the impact of using small classes

Change-Id: I29c68ce88fef599091a84f8bdec54778e4d62b03
Reviewed-on: http://codereview.qt-project.org/5257
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoMove some settings pages.
Eike Ziller [Tue, 20 Sep 2011 14:06:03 +0000 (16:06 +0200)]
Move some settings pages.

Reducing vertical size of preferences dialog, and moving languages
settings adjacent.

Change-Id: I1cb5a4310350a0552c920982854f671ae443ed7e
Reviewed-on: http://codereview.qt-project.org/5251
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoQmlDesigner.NodeInstances: Change Assert in exit
Marco Bubke [Tue, 20 Sep 2011 13:24:58 +0000 (15:24 +0200)]
QmlDesigner.NodeInstances: Change Assert in exit

Change-Id: I9a19ab772db406b0b1e6f9b76b997dcee17bccbf
Reviewed-on: http://codereview.qt-project.org/5244
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoQmlDebugger: Also show status of QDeclarativeEngine client in log
Kai Koehne [Tue, 20 Sep 2011 10:29:03 +0000 (12:29 +0200)]
QmlDebugger: Also show status of QDeclarativeEngine client in log

Fix QDeclarativeEngineDebug to use the same enum as the other clients.
Also, use objectName() to name the clients.

Change-Id: I826970bf248ce2f50c4bf66c1f58c0b9b56698b1
Reviewed-on: http://codereview.qt-project.org/5231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
12 years agoQMLDebugger: Unify status messages
Kai Koehne [Tue, 20 Sep 2011 10:05:43 +0000 (12:05 +0200)]
QMLDebugger: Unify status messages

Use "QML Debugger" as in qmlengine.cpp . Also don't print a warning
if the status is 'unavailable' as this is the default first state
in ',block' mode.

Change-Id: I21d8285eabdb6a2ced87ddc865eae1704e843cd0
Reviewed-on: http://codereview.qt-project.org/5228
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
12 years agoQmlProfiler: Show 'retry' message box when connect fails
Kai Koehne [Wed, 14 Sep 2011 11:26:19 +0000 (13:26 +0200)]
QmlProfiler: Show 'retry' message box when connect fails

Show the same message box as in the debugger if connecting to
the port fails.

Change-Id: I5f101fa6e7fc6166ad37c88d046aafca24a4276f
Reviewed-on: http://codereview.qt-project.org/4891
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
12 years agoQmlDesigner: code cleanup
Thomas Hartmann [Tue, 20 Sep 2011 09:46:37 +0000 (11:46 +0200)]
QmlDesigner: code cleanup

Change-Id: Id2ce92b7b1f6bc190c0ac4899c951b8f3cff9535
Reviewed-on: http://codereview.qt-project.org/5225
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>