OSDN Git Service
Christian Kamm [Tue, 25 Oct 2011 11:42:07 +0000 (13:42 +0200)]
C++ parser: Don't fail on REVISION in Q_PROPERTY.
Change-Id: Ia7407969dc56308fe3eb843e97b93e65eb235186
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Robert Loehning [Thu, 20 Oct 2011 19:20:32 +0000 (21:20 +0200)]
Removed dead assignments
Change-Id: I7cd0e127c23d209d210385906d0923bce650a3e5
Reviewed-by: hjk <qthjk@ovi.com>
Robert Loehning [Fri, 21 Oct 2011 12:25:54 +0000 (14:25 +0200)]
Removed dead assignment
Change-Id: Ia4b9c27b8aa405e3e7c6e92639eb105689a0f299
Reviewed-by: hjk <qthjk@ovi.com>
Robert Loehning [Fri, 21 Oct 2011 14:39:14 +0000 (16:39 +0200)]
"Build Issues" was renamed to "Issues"
Change-Id: If514e2497a52456bfd16aaebf2a7c83def4621f7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kamm [Tue, 25 Oct 2011 09:28:51 +0000 (11:28 +0200)]
C++: Fix a crash in debug builds when rewriting functions.
Change-Id: I35266b69d1cc433c4d9176cc849efd03ea1cc1cd
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Thomas Hartmann [Wed, 19 Oct 2011 14:52:30 +0000 (16:52 +0200)]
QmlDesigner.formeditor: fix captions
To avoid confusion we rotate item captions and place them
on the upper right.
Change-Id: I97ba7ef93a8b0a6aa678af6a9ee5f76e649e5baa
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
hjk [Thu, 13 Oct 2011 15:06:28 +0000 (17:06 +0200)]
welcome: less artifacts in top bar
Change-Id: I38af2be3bffccee8b3fa2f9094c21f2b06800371
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kandeler [Mon, 24 Oct 2011 15:29:58 +0000 (17:29 +0200)]
Fremantle: Don't use unsupported "mad" option.
Our SDK uses an outdated MADDE that does not support
the "--no-force-downgrade" option when deploying into the sysroot.
Task-number: QTCREATORBUG-6328
Change-Id: Icb0c9774daee9b9840403ca8a14c9f6604cf3624
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kandeler [Mon, 24 Oct 2011 14:42:29 +0000 (16:42 +0200)]
Harmattan: Prevent localized debian changelog entries (again).
Task-number: QTCREATORBUG-3589
Change-Id: Ib8d6b87ef920dae92a7bb6b07741591e9995a6cf
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kandeler [Tue, 18 Oct 2011 08:02:21 +0000 (10:02 +0200)]
Update changes file for RemoteLinux.
Change-Id: I206aa9fa97049bafa0e3770c8d8c518a51a649e5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kamm [Mon, 24 Oct 2011 10:29:21 +0000 (12:29 +0200)]
QmlJS: Remove soft assert that could trigger for multi-line strings.
Change-Id: I54f451677d78d6aefe0f567888b9bbcec426fc72
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Eike Ziller [Mon, 24 Oct 2011 10:53:10 +0000 (12:53 +0200)]
Some corrections about our binary compatibility.
Change-Id: Ic54b7f7a2f574a6be9caeefa64912bb9e0cc11fb
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Mon, 24 Oct 2011 10:08:11 +0000 (12:08 +0200)]
corelib: fix capitalization in comment
Change-Id: Iee6336a34d3eabf023ce62bdbba7a05888f4fa46
Reviewed-by: hjk <qthjk@ovi.com>
Sergey Belyashov [Fri, 21 Oct 2011 17:59:51 +0000 (21:59 +0400)]
Updated Russian translation
Change-Id: Ie34266234132e0f6bfec578caa3f8a6bba27f57c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Jarek Kobus [Fri, 14 Oct 2011 12:55:55 +0000 (14:55 +0200)]
Polish Polish translations
Change-Id: Iadb2aae531e82eaa2a824a7b019416c53c6bbf3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Jarek Kobus [Fri, 14 Oct 2011 11:06:29 +0000 (13:06 +0200)]
Update Polish translations
Change-Id: I267392c7b988dc32d0d3cca6f07ec75b7c80a417
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Christian Kamm [Mon, 24 Oct 2011 08:20:19 +0000 (10:20 +0200)]
QmlJS checks: Make 'unintentional empty block' warning less annoying.
Already fixed differently in master.
Change-Id: I92f7665166b2b1ca4f3d4598825b04f3f19d4772
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Aurindam Jana [Thu, 20 Oct 2011 15:32:29 +0000 (17:32 +0200)]
BreakDialog: Command and Message Fields.
Enable command and message fields for only those breakpoint types
that require Tracepoint part.
Change-Id: Id4d9e3447f85dad6fecb3e0f2f178cb3dff2f718
Reviewed-by: hjk <qthjk@ovi.com>
Robert Loehning [Fri, 21 Oct 2011 13:23:53 +0000 (15:23 +0200)]
Removed dead assignments
Change-Id: I1368cb534284016479211160cd8bf3cbc2f738e4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
hjk [Fri, 21 Oct 2011 14:13:33 +0000 (16:13 +0200)]
update changes-2.4.0
Change-Id: I2f95f6205ab971db64315ff11e0804031ff900e0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
hjk [Wed, 19 Oct 2011 09:52:26 +0000 (11:52 +0200)]
debugger: re-enable use of -exec-interrupt
Change-Id: I638ba4f866d2dc80a0aa81c718962e9e6ebd2c54
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Daniel Teske [Mon, 17 Oct 2011 14:39:48 +0000 (16:39 +0200)]
Remove left over code, state is unused since 6dc4a0
Change-Id: Ic44c62fceb64c07f1a1af6e7c8644ab526f03269
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Pawel Polanski [Fri, 21 Oct 2011 08:29:33 +0000 (10:29 +0200)]
CODA: v4.1.x won't have problems with SR2 firmware
This does not affect CODA v4.0.x on SR1
Change-Id: Ic833449a0eb38315e27d11fe3a308b97e9454767
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Oswald Buddenhagen [Thu, 20 Oct 2011 20:56:26 +0000 (22:56 +0200)]
move api docs to ... the api
\fn is a fallback for stuff from headers
Change-Id: I7c5a187bf2cfae2682fd267f30da479488d2592e
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Robert Loehning [Thu, 20 Oct 2011 19:07:00 +0000 (21:07 +0200)]
Removed dead assignment
Change-Id: Ie7296c081654f4642a686a84bb8e8cf1d54a279d
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Robert Loehning [Thu, 20 Oct 2011 18:55:29 +0000 (20:55 +0200)]
Removed dead assignment
Change-Id: I135818def06fa2daf27282380f3ce2b2d71937a3
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Robert Loehning [Thu, 20 Oct 2011 16:37:38 +0000 (18:37 +0200)]
Moved unused code for debugging
Change-Id: I591bc847f91bfd628f7af8a034d3abc40b8d242c
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Robert Loehning [Thu, 20 Oct 2011 16:54:07 +0000 (18:54 +0200)]
Removed dead code
Change-Id: I613daecfe47a17622f30d38d4b74dd21949a08ad
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Robert Loehning [Thu, 20 Oct 2011 16:00:20 +0000 (18:00 +0200)]
Removed unread variables
Change-Id: Ifd0bec1762d97a957515931408269a153ae136d2
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Fri, 21 Oct 2011 11:27:35 +0000 (13:27 +0200)]
C++: Improve calculation of function argument count.
Reuse Function::argumentCount instead of reimplementing it.
Change-Id: I05ba2dbee087e5dfd53c7af3ec94d214f6e37a54
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Leandro Melo [Fri, 21 Oct 2011 10:40:01 +0000 (12:40 +0200)]
C++: Fix arg. count for functions with function-try-blocks
Task-number: QTCREATORBUG-6343
Change-Id: I71575098c71611dc8514288f7938af4c409ebaa3
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Thomas Hartmann [Fri, 21 Oct 2011 10:40:39 +0000 (12:40 +0200)]
QmlDesigner.metaSystem: fix fot Qt Components
In the case of "." imports we loose the package name.
This patches "maps back" to QtQuick by default or maps to <cpp>
if the package name is empty.
Change-Id: Ibe8d782541d109049f3480c7dfd15de69d75da38
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Daniel Teske [Thu, 20 Oct 2011 18:37:35 +0000 (18:37 +0000)]
Make sure we pass -after arguments after user arguments
Otherwise the user can't pass on normal arguments
Task-number: QTCREATORBUG-6346
Change-Id: I986563a75113a6d5acf601b5ccb63d6a35570bad
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Fri, 21 Oct 2011 09:24:16 +0000 (09:24 +0000)]
Update changes-2.4.0
Add all the people that contributed MRs to 2.4!
Change-Id: I1938f3315e7c0abd09501fd7bade7d8758190aba
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Friedemann Kleint [Fri, 21 Oct 2011 08:33:26 +0000 (10:33 +0200)]
Fix build.
Revert part of
3dac9bd4e5f38c054b148788c56ceeea0bbba812.
Change-Id: I2af57e609b0554d1f8f2c361813068a6ca7c14e8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Daniel Teske [Thu, 20 Oct 2011 16:24:51 +0000 (16:24 +0000)]
Fix id of gcc toolchains to include the correct abi
Change-Id: Ibdccea90c1a234a5c4ddaed27f0d50cb3204f603
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Christian Kamm [Fri, 21 Oct 2011 07:39:49 +0000 (09:39 +0200)]
QmlJS: Fix black-on-black text with dark color schemes.
Change-Id: Ie0eacf9677abe23e28eaa7b9491e6a21ea4f7dfc
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Robert Loehning [Thu, 20 Oct 2011 16:31:25 +0000 (18:31 +0200)]
Moved unused code for debugging
Change-Id: I2c078ba2e48d7e1e13c6fddcba5f27b6a88bf704
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Vlad Brovko [Thu, 20 Oct 2011 20:33:54 +0000 (22:33 +0200)]
don't rewrite symlink on save, rewrite target instead
Merge-request: 399
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: If81446a8fd49e9de7611c2f09abd39af2c9c930d
Robert Loehning [Thu, 20 Oct 2011 17:11:59 +0000 (19:11 +0200)]
Fixed dead initialization
Change-Id: I839a8478cd57e872fb5a145f095b3b57f25fdf11
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Eike Ziller [Thu, 20 Oct 2011 16:47:00 +0000 (18:47 +0200)]
Version bump.
Change-Id: Ia3d10553312520293ad935812792f9b2a1fd3b7a
Robert Loehning [Thu, 20 Oct 2011 15:36:54 +0000 (17:36 +0200)]
Added missing tr()
Change-Id: I7e3a2da45d20c72b9482c39f783564001583e95b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Aurindam Jana [Mon, 17 Oct 2011 13:10:16 +0000 (15:10 +0200)]
Debugger: Tooltip in Stack Window
Show only those fields in tooltip that have proper values.
Task-number: QTCREATORBUG-6336
Change-Id: I6fdc5fcae8c36e0115fb9268531f5bb16ce48fe0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Aurindam Jana [Tue, 18 Oct 2011 14:35:05 +0000 (16:35 +0200)]
QScriptDebugger: Enable ChangeBreakpoint
Breakpoint can be enabled and disabled.
Change-Id: Ib13b429a72251e9d99b017354601fdd44c6d024e
Reviewed-by: hjk <qthjk@ovi.com>
Bill King [Wed, 19 Oct 2011 14:52:45 +0000 (16:52 +0200)]
Tests: Make compile.
Change-Id: I416c7cc20a07a4542e16e13519e784ee42fd73fd
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Thu, 20 Oct 2011 13:41:44 +0000 (15:41 +0200)]
RefactoringFile: Use editor's cursor, if possible.
This fixes 'undo' with quick fixes not preserving the original cursor
position.
Change-Id: If6475a5afab3e806ea713c769f730c6ffd773298
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Daniel Teske [Thu, 20 Oct 2011 12:59:13 +0000 (12:59 +0000)]
Add runControl started/finished signals to the projectexplorer
Change-Id: I17e6f09af61d4acf490eb48be690ddeacc10aac3
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Thomas Hartmann [Thu, 20 Oct 2011 07:11:19 +0000 (09:11 +0200)]
QmlDesigner.formEditor: layoutfix for full screen mode
Change-Id: I92b2d8c69d50ef0b76b1eb94ea481a442915c2e4
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Thomas Hartmann [Thu, 20 Oct 2011 07:07:32 +0000 (09:07 +0200)]
QmlDesigner.formeEditor: layout fix
Task-number: QTCREATORBUG-6286
Change-Id: I9b5b56f01d5b4a1b35df95026c4ec090cb7ab7c4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kamm [Thu, 20 Oct 2011 09:40:58 +0000 (11:40 +0200)]
Fix tests/auto/cplusplus/codegen on windows.
Change-Id: I765baa58c6b39d98949c0c8530623baf112f42bb
Reviewed-by: Bill King <bill.king@nokia.com>
Christian Kamm [Thu, 20 Oct 2011 09:25:38 +0000 (11:25 +0200)]
QmlJS/C++: Fix possible crash on exit.
It could crash if a thread to find exported cpp types was still running
after the ModelManager was destroyed.
Change-Id: Ia48fac9c2ad1296992af83af57e84cce8c4f95ae
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Friedemann Kleint [Thu, 20 Oct 2011 08:45:59 +0000 (10:45 +0200)]
Debugger: Prevent adding invalid breakpoints.
Check on session restore and add.
In particular, suppress watchpoints at 0x0,
which hang gdb.
Change-Id: I648f53a709fabdebe641e478f367f1354a315ab1
Reviewed-by: hjk <qthjk@ovi.com>
Leena Miettinen [Thu, 20 Oct 2011 07:38:33 +0000 (09:38 +0200)]
Doc: Layout in Column, Row, Grid, or Flow
Change-Id: Ic1613e4017a3ff038e235530668afb97f80a31d0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Leena Miettinen [Thu, 20 Oct 2011 07:35:39 +0000 (09:35 +0200)]
Doc: update screenshot
Change-Id: Ibf739024dbc27a0b3b8dd77a277dc5590ed670a4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Wed, 19 Oct 2011 13:31:14 +0000 (15:31 +0200)]
Doc: Go into Component function
Change-Id: I2be678a463370730ebdb9497c30da3b90dbbf931
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Daniel Teske [Mon, 17 Oct 2011 13:57:15 +0000 (15:57 +0200)]
Initialize pointers, fix correct gcc 4.6 warning
Change-Id: I53a63013e8c440bacd21bacb8afecd9f055cbce4
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kai Koehne [Wed, 19 Oct 2011 13:21:20 +0000 (15:21 +0200)]
Add QML Debugger/Profiler changes to 2.4 changelog
Change-Id: I54089600c863620c1410ba553cb20c5e8c63bd5a
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Tobias Hunger [Wed, 19 Oct 2011 14:07:26 +0000 (14:07 +0000)]
SVN: Refactor SVN detection code
Reviewed-by: Jonathan Liu <net147@gmail.com>
Change-Id: Ib78251b69a89ee503bb78ab122c6e37a6ec7aacb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Jonathan Liu [Wed, 19 Oct 2011 14:06:40 +0000 (14:06 +0000)]
SVN: Fix handling of svn:externals for Subversion 1.7
Change-Id: I3f869fd316d2f2a3a41c622321cebb79575c423f
Merge-request: 409
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Leena Miettinen [Wed, 19 Oct 2011 12:01:12 +0000 (14:01 +0200)]
Doc: update screenshots
Task-number: QTCREATORBUG-6326
Change-Id: I86e9723399668a716cc4508d511fcb533a896e11
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Kai Koehne [Wed, 19 Oct 2011 10:36:06 +0000 (12:36 +0200)]
QtOptionsPage: Don't build qml helpers for 4.8
They're not required any more.
Change-Id: If55d835600ea0ddf6b6b54f8fdd88e2025fc17be
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Kai Koehne [Wed, 19 Oct 2011 10:23:56 +0000 (12:23 +0200)]
QtOptionsPage: Fix disabled buttons after "Build All" for helpers
Remove unbuildable helpers in the table of current ongoing builds.
Task-number: QTCREATORBUG-6320
Change-Id: I55c73a868c87d8cd382e4bbae3ed507dc7ed052b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Daniel Teske [Mon, 17 Oct 2011 15:36:53 +0000 (17:36 +0200)]
Disallow a few more special shell characters
qmake's quoting of them is broken, thus disallow them
Task-number: QTCREATORBUG-6025
Change-Id: I535f7c59865751bd878b245e4c29f83447b91cce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Daniel Teske [Mon, 17 Oct 2011 14:42:01 +0000 (16:42 +0200)]
Remove code that has no effect
Change-Id: I78dfdf4c0c1f8f6901a15a1e084b740d0c5cbf2c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Leena Miettinen [Wed, 19 Oct 2011 09:16:07 +0000 (11:16 +0200)]
Doc: update the path to locator options.
Fix typos and update screenshots.
Task-number: QTCREATORBUG-6307
Change-Id: Ie015fd50c437519e41e96f63a91894a1f730c662
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
hjk [Wed, 19 Oct 2011 07:38:35 +0000 (09:38 +0200)]
projectexplorer: add some visual grouping on the run settings page
Change-Id: If529364653481f9ad4c0005564fae7ff476b1871
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
hjk [Wed, 19 Oct 2011 09:51:51 +0000 (11:51 +0200)]
debugger: fix order of special actions to start debugging
Change-Id: I0190012c4fe2ea916947561cb76e7974410fd6a1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Jonathan Liu [Sat, 15 Oct 2011 05:18:47 +0000 (16:18 +1100)]
Add support for Subversion 1.7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Change-Id: Ide2c13f0e69f9807995539b2634ecec216125d5c
Merge-request: 405
Task-number: QTCREATORBUG-6313
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Tobias Hunger [Wed, 19 Oct 2011 08:33:33 +0000 (08:33 +0000)]
scripts: Fix handling of spaces
Change-Id: I8972fc656dadee54467cc710ff2f832f729a2ce8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Thomas Hartmann [Wed, 19 Oct 2011 08:38:53 +0000 (10:38 +0200)]
WelcomePage: fix clicking on title
Task-number: QTCREATORBUG-6348
Change-Id: I13ec93fadcfad83f248e5b5b8615cd8818f8392c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Daniel Teske [Fri, 7 Oct 2011 13:40:38 +0000 (15:40 +0200)]
Fix -spec parameter not used in profile evaluation nor code model
Task-number: QTCREATORBUG-4723
Change-Id: I845326bdc8726c27502c66c5aeaacb0d286c54c1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Thu, 13 Oct 2011 14:58:55 +0000 (16:58 +0200)]
welcome screnn: adjust color of vertical separator
Change-Id: Id607064c522f9d88a981a2b2f7ff4fd75d04ead4
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Eike Ziller [Tue, 18 Oct 2011 15:13:33 +0000 (17:13 +0200)]
Fix licenses.
Change-Id: I834bc5da86c97ddaeefb43011444da8ed0e85180
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Friedemann Kleint [Tue, 18 Oct 2011 14:01:32 +0000 (16:01 +0200)]
L10n: Update German translation for 2.4 beta.
Change-Id: If871c83b4ba2346f7eb343a7391a2972018445d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Leena Miettinen [Tue, 18 Oct 2011 13:25:46 +0000 (15:25 +0200)]
Doc: update screen shots
Change-Id: I10783266291a9fe090f8f8f65d3447e791daefff
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Tue, 18 Oct 2011 11:56:21 +0000 (13:56 +0200)]
Doc: Maemo Qemu Emulator was renamed MeeGo Qemu Emulator
Update screenshots
Change-Id: I24ed8955ebfe7a35bb0dafcb2bd4f0c4b81c7355
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Pawel Polanski [Tue, 18 Oct 2011 11:48:46 +0000 (13:48 +0200)]
Symbian: Stepping into functions has been fixed
While debugging Symbian C++ applications
stepping into functions has not been working due to
a typo in the python file
Change-Id: I76710fe3f599303059f773030e57d778164bcebb
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Oswald Buddenhagen [Tue, 18 Oct 2011 11:50:38 +0000 (13:50 +0200)]
Merge branch '2.3' into 2.4
Conflicts:
src/plugins/debugger/commonoptionspage.ui
src/plugins/madde/maemoqtversion.cpp
src/plugins/projectexplorer/runsettingspropertiespage.ui
Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
Tobias Hunger [Tue, 18 Oct 2011 11:31:06 +0000 (11:31 +0000)]
Git: Update settigspage
Task-number: QTCREATORBUG-6308
Change-Id: Ie791cee6f132a4aab345d6c9b3cde56053476e8d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Thomas Hartmann [Fri, 14 Oct 2011 10:34:50 +0000 (12:34 +0200)]
QmlDesigner.propertyEditor: fix caption for BorderImage
Change-Id: If09b81ad1e5ea0f6e5bc34633a5b65ec261944d6
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Thomas Hartmann [Fri, 14 Oct 2011 10:34:29 +0000 (12:34 +0200)]
QmlDesigner.desktopWidgetsPlugin: fix for metainfo
Keep default size of TextField and add Label.
Change-Id: I65a90c810b1ec9a105992ee976b6c9c99aa272bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Thomas Hartmann [Tue, 18 Oct 2011 10:25:08 +0000 (12:25 +0200)]
QmlDesigner.puppet: disable breakbad for qmlpuppet
Change-Id: Idda4a8b674eaabe24de6b2d0c9f7067046d22d70
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Victor Ostashevsky [Tue, 18 Oct 2011 10:44:08 +0000 (12:44 +0200)]
Ukrainian translation updated
Debugging with GDB was translated
Merge-request: 406
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I60d87b2985ed041279fb7db35d1d77338a234849
Tobias Hunger [Tue, 18 Oct 2011 10:39:10 +0000 (10:39 +0000)]
Codepaster: Trim server name
Task-number: QTCREATORBUG-6329
Change-Id: I236f3ae2526d020596c990089fbe6b0e167b4fd9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Oswald Buddenhagen [Mon, 17 Oct 2011 17:37:07 +0000 (19:37 +0200)]
compile with Visual Studio IDE, take 2
Change-Id: I30147eeb58e44ef137fb25763f6be6b4d247d6c7
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Oswald Buddenhagen [Mon, 17 Oct 2011 17:44:08 +0000 (19:44 +0200)]
de-obfuscate code
remove pointless condition and join identical branches.
Change-Id: Iefe86e580d485cba1a71e2a379781b342d8c75d8
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Leena Miettinen [Tue, 18 Oct 2011 09:27:30 +0000 (11:27 +0200)]
Doc: move options to a new Build & Run category
Move General settings (from Projects) Tool Chains, Qt Versions,
and CMake settings
Task-number: QTCREATORBUG-6327
Task-number: QTCREATORBUG-6326
Task-number: QTCREATORBUG-6307
Change-Id: I87b2238ac0b44f56363c85366157ae70ac694211
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Aurindam Jana [Mon, 17 Oct 2011 15:45:15 +0000 (17:45 +0200)]
QmlCppEngine: StackWindow Behaviour
Enable/Disable the stack window based on engine state.
Update the markers in the stack window correctly.
Change-Id: Idbc694aa2a4be9497e2e3b2c9e9a1f463e1c7692
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
hjk [Wed, 12 Oct 2011 14:34:02 +0000 (16:34 +0200)]
debugger: re-enable interrupting in remote setups
Change-Id: I6d4503ec78e3ce590691dde69992a1599b506fc5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
(cherry picked from commit
0e8657107c8989f91b6f1b1f9ff70547ed5e962d)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
hjk [Wed, 12 Oct 2011 15:56:31 +0000 (17:56 +0200)]
help: Add '...' to indicate there will be another dialog
Change-Id: Ic884acf20f1d1a48f5306b380338fd0a99d63fa8
Reviewed-by: hjk <qthjk@ovi.com>
(cherry picked from commit
6ae50657041efc7c13910b495f25a01043d849bb)
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Robert Loehning [Mon, 17 Oct 2011 17:09:51 +0000 (19:09 +0200)]
Squish: Use isinstance() instead of comparing classnames
Change-Id: Ia0683902e96f1dc175978bdbb13fbd114f6ad739
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Aurindam Jana [Mon, 17 Oct 2011 13:23:42 +0000 (15:23 +0200)]
QmlEngine: Activate selected frame only in specific states
Selecting a row in stack window activates the frame only if the
state is InferiorStopOk or InferiorUnrunnable, as followed by
gdbengine.
Change-Id: Iad6a16816c0ffd634572f26e1dcf8c3c577502db
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Tobias Hunger [Mon, 17 Oct 2011 18:22:29 +0000 (20:22 +0200)]
ToolChain: Fix parsing of gcc output and localization
Task-number: QTCREATORBUG-6253
Change-Id: Icb5b204e93e216c94b369349992d1eb21ec60a62
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Friedemann Kleint [Mon, 17 Oct 2011 12:21:06 +0000 (14:21 +0200)]
Designer: Hint at case-mismatches of #include if 'Goto Slot' fails.
Task-number: QTCREATORBUG-6310
Change-Id: Ibd10043c775832f3195c39f9d94b72c6d1447c9d
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Robert Loehning [Fri, 14 Oct 2011 14:29:46 +0000 (16:29 +0200)]
Squish: Let one function handle last page of all project wizards
Change-Id: I74e2c2f0c50a3131ad66fbde5e4a7fe004b7ebff
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Pawel Polanski [Mon, 17 Oct 2011 14:45:22 +0000 (16:45 +0200)]
Symbian^3 specific include paths added
Change-Id: I003066e7aaebaf4508695b8588bb8bea893f992c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Daniel Molkentin [Mon, 17 Oct 2011 14:22:22 +0000 (16:22 +0200)]
Manual amendment to
c1a80016262e3d8f83a8aae2b64105ef4338449b.
Missed one plugin.
Change-Id: Id148f6e818bc18b65cf4b882af6f219a04336978
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Aurindam Jana [Mon, 17 Oct 2011 13:06:56 +0000 (15:06 +0200)]
Debugger: Show/Hide Address Column in Stack Window
Show Address column in stack window only if explicitly enabled.
The address column is hidden by default.
Change-Id: I4e4b019dbcde1c2edb9fb3012831eee5054a8a22
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Molkentin [Mon, 17 Oct 2011 13:34:22 +0000 (15:34 +0200)]
Fix make install for qml designer plugins.
Change-Id: I94bd2227da8567aa7c43daf9313ebbda1010c99f
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Robert Loehning [Mon, 17 Oct 2011 13:23:00 +0000 (15:23 +0200)]
Revert "Compile with Visual Studio IDE: string macros don't need to be escaped"
This reverts commit
fe80df7e2ffb9ca334723d13af749c7b3dc973a8.
With the above commit, Creator could not be compiled with MSVC 2008.
Change-Id: Idf4763fa1996edf3b94b7059b1889e0b4dd74d38
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>