OSDN Git Service
Christian Stenger [Mon, 5 Sep 2011 13:00:01 +0000 (15:00 +0200)]
Improved writing tasks files
Change-Id: Ia7dfa0c4554082e8620cfbed40e3f105fb8ff2e1
Reviewed-on: http://codereview.qt.nokia.com/4205
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
hjk [Fri, 2 Sep 2011 17:11:10 +0000 (19:11 +0200)]
editormanager: style
Change-Id: I3536ba31d8be8bcd8330fb7b4174a6ae3cd95cb5
Reviewed-on: http://codereview.qt.nokia.com/4214
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Fri, 2 Sep 2011 12:50:08 +0000 (14:50 +0200)]
fakevim: save a few string->int->string roundtrips
Change-Id: Id21ce47ecf267f37f2433f2423dccfd9dcee6c42
(cherry picked from commit
1a503d867c34ced26fa8ca8ca12d2fc22b2f0d81)
Reviewed-on: http://codereview.qt.nokia.com/4198
Reviewed-by: hjk <qthjk@ovi.com>
Erik Verbruggen [Mon, 5 Sep 2011 13:25:55 +0000 (15:25 +0200)]
C++: fixed potential crash for out of bounds access of token_names.
Cause: Q_PRIVATE_PROPERTY didn't have an entry in token_names, so if
Token::spell or Token::name was called on a T_Q_GADGET, an out-of-bounds
access would occur.
Change-Id: I1ec7b91a5d3def5508e21ad4f1863a52cb4ed540
Reviewed-on: http://codereview.qt.nokia.com/4207
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
hjk [Fri, 2 Sep 2011 10:45:36 +0000 (12:45 +0200)]
core: progress on the QString->QByteArray for Core::Id, remove UniqueIDManager
Change-Id: I94bec127866822b790a6e45a4201a7a5fe71d6ce
Reviewed-on: http://codereview.qt.nokia.com/4208
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Teske [Fri, 2 Sep 2011 10:51:25 +0000 (12:51 +0200)]
Convert slashes on restoring sbs and epoc directory
Apparently there are some users with wrong slashes in their settings.
I'm not sure how that happened, but better be safe.
Task-Nr: QTCREATORBUG-5969
Change-Id: Ifb7cc392e53d84da916d06e546ceff02057c6014
Reviewed-on: http://codereview.qt.nokia.com/4133
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Fri, 2 Sep 2011 15:15:18 +0000 (17:15 +0200)]
core: remove usages of Core::ICore::instance()->modeManager()
The function is still there but should be remove in my opinion.
Change-Id: I739fe942e74f459faccb80b5bcb8a5721c6bb9bf
Reviewed-on: http://codereview.qt.nokia.com/4200
Reviewed-by: hjk <qthjk@ovi.com>
Marco Bubke [Thu, 1 Sep 2011 17:49:04 +0000 (19:49 +0200)]
QmlDesigner.NodeInstances: Fix reparent bug
Change-Id: I4a05ddc9e28e02aa9b9a8f602b3726fc53743245
Reviewed-on: http://codereview.qt.nokia.com/4101
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Daniel Teske [Mon, 5 Sep 2011 11:47:29 +0000 (13:47 +0200)]
Better error feedback on Open project
Task-Nr: QTCREATORBUG-5996
Task-Nr: QTCREATORBUG-5995
Change-Id: I4184a1c652cbfc93a788a8f9b67d936401e197b9
Reviewed-on: http://codereview.qt.nokia.com/4197
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Fri, 2 Sep 2011 17:05:12 +0000 (19:05 +0200)]
helpmanager: cleanup
Change-Id: I7bd885e9e64f8be99a040b14151cd8fba5249235
Reviewed-on: http://codereview.qt.nokia.com/4202
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Fri, 2 Sep 2011 17:11:45 +0000 (19:11 +0200)]
actioncontainer: style
Change-Id: I8f83b11250817425a06c063532e5662cb72fb7dc
Reviewed-on: http://codereview.qt.nokia.com/4204
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Mon, 5 Sep 2011 11:35:16 +0000 (13:35 +0200)]
QmlJS: Fix lookup for enums.
* Also look for enums in prototypes.
* Report back which QmlObjectValue had the enum.
* Fix a bug where enum lookup was always skipped.
Change-Id: I9c9fd8f8cf9bd8cc5f1bb5688fef5786267cd794
Reviewed-on: http://codereview.qt.nokia.com/4192
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Daniel Teske [Mon, 5 Sep 2011 08:19:49 +0000 (10:19 +0200)]
Add "Find in directory" to project tree context menu
And also to the filesystem view.
Task-Nr: QTCREATORBUG-5879
Change-Id: I27bfe05808182f56deafd6ceab474894631f0a26
Reviewed-on: http://codereview.qt.nokia.com/4185
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Kai Koehne [Mon, 5 Sep 2011 10:31:01 +0000 (12:31 +0200)]
Rename qmlprofiler to qmlprofilertool
Avoid clash with qmlprofiler.pro from plugins which causes problems
for Visual Studio Solution.
Change-Id: I360b952ab9170a4823ef0cab75b969512af5c31f
Reviewed-on: http://codereview.qt.nokia.com/4190
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Stenger [Mon, 5 Sep 2011 09:00:32 +0000 (11:00 +0200)]
Improved build handling when build fails without errors inside build issues
Change-Id: I0958a9a8e644c245fb0930f5d165e0aac4a74ce8
Reviewed-on: http://codereview.qt.nokia.com/4184
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Eike Ziller [Mon, 5 Sep 2011 07:40:07 +0000 (09:40 +0200)]
Make compilation with "qmake" instead of "qmake -r" work again.
The dependencies between app and libs are a bit more complicated now,
since qmake must run on app (to generate app_version.h) before the
utils lib is compiled.
Change-Id: I836683b80810ad35d296366f89bb1d2a98a3afb4
Reviewed-on: http://codereview.qt.nokia.com/4180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Christian Kamm [Mon, 5 Sep 2011 07:35:20 +0000 (09:35 +0200)]
QmlJS: Remove unused function.
Change-Id: I3e700b7f00f7a23433979a81b0ea092b8a934e63
Reviewed-on: http://codereview.qt.nokia.com/4177
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Mon, 5 Sep 2011 10:03:47 +0000 (12:03 +0200)]
C++: Jump to better location when function signature is updated.
This will allow using 'Follow Symbol' to jump back after the change.
Change-Id: I99fd3ebc63a2af58b12eee9d7055a4c2f249e97d
Reviewed-on: http://codereview.qt.nokia.com/4186
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Mon, 5 Sep 2011 08:33:17 +0000 (10:33 +0200)]
C++: Trigger function signature change via quick fix.
This way we don't need to override Return and Escape.
Change-Id: I1548118c06ee7338ba3dd9d84b82b9314ab16782
Reviewed-on: http://codereview.qt.nokia.com/4183
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Tobias Hunger [Thu, 1 Sep 2011 14:10:49 +0000 (14:10 +0000)]
Qt4: Fix initializiation of tool chain
Change-Id: I0a37cf56ee3b609c9cabd4926b8a13b962491124
Reviewed-on: http://codereview.qt.nokia.com/4087
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Tobias Hunger [Thu, 1 Sep 2011 14:11:21 +0000 (14:11 +0000)]
Classview: Remove dead code
Change-Id: I753daa24d4ab1c8b03f324a42f36e71697517a9f
Reviewed-on: http://codereview.qt.nokia.com/4088
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Tobias Hunger [Thu, 1 Sep 2011 14:10:00 +0000 (14:10 +0000)]
CVS: Fix comparison of settings
Clang did pick this one up.
Change-Id: I150a4b4d9a504b1b6d741a0e10db10c63523bcd3
Reviewed-on: http://codereview.qt.nokia.com/4086
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Bill King [Fri, 2 Sep 2011 10:19:54 +0000 (12:19 +0200)]
Fix openQmakeProject to match new combo value.
Change-Id: Ice0050bf1bb7af59eb57c1e9218d96b3114f4c08
Reviewed-on: http://codereview.qt.nokia.com/4129
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
hjk [Fri, 2 Sep 2011 10:37:53 +0000 (12:37 +0200)]
imageviewer: simplify ImageViewerActionHandler
Change-Id: Iccd651c960cced8432e50bd861992c3240109bce
Reviewed-on: http://codereview.qt.nokia.com/4132
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
hjk [Fri, 2 Sep 2011 10:16:56 +0000 (12:16 +0200)]
ImageViewer: adjust to style guide
Change-Id: Id0f5a521199b9dc5b29fc3cb7b7bd82521bc00e6
Reviewed-on: http://codereview.qt.nokia.com/4130
Reviewed-by: hjk <qthjk@ovi.com>
Jarek Kobus [Fri, 2 Sep 2011 10:12:11 +0000 (12:12 +0200)]
Pass focusOutEvent to the superclass
Task-number: QTCREATORBUG-5981
Change-Id: I46e62849f277bc9ac959b95f328dff6d13ffc658
Reviewed-on: http://codereview.qt.nokia.com/4128
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kamm [Thu, 1 Sep 2011 13:33:48 +0000 (15:33 +0200)]
Remove some dead stores pointed out by clang.
Change-Id: I919a2e98474fec42861391d11d2ba1225eb2adf9
Reviewed-on: http://codereview.qt.nokia.com/4083
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
hjk [Fri, 2 Sep 2011 08:26:06 +0000 (10:26 +0200)]
debugger: fix off-by-one location marker on last instruction in a function
Change-Id: Iecdce6e3935cc002ab2c6c6e346f879db1898a6d
Reviewed-on: http://codereview.qt.nokia.com/4121
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Fri, 2 Sep 2011 07:43:55 +0000 (09:43 +0200)]
debugger: fix disassembler
Change-Id: I9e6ea258f6009a8299c0ddc2400abdb07e6dc6eb
Reviewed-on: http://codereview.qt.nokia.com/4120
Reviewed-by: hjk <qthjk@ovi.com>
Robert Loehning [Thu, 1 Sep 2011 20:06:57 +0000 (22:06 +0200)]
Removed dead code
Change-Id: I54eaa6c994ca4628d8e4a89b28df6f72f2029a11
Reviewed-on: http://codereview.qt.nokia.com/4104
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sunil Thaha <sunil.thaha@nokia.com>
Reviewed-by: Shane Bradley <shane.bradley@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Stenger [Thu, 1 Sep 2011 12:09:25 +0000 (14:09 +0200)]
Added function to read out build issues
Change-Id: I1300fd9b7f136fa747f8f0063e232a2803548963
Reviewed-on: http://codereview.qt.nokia.com/4072
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
hjk [Fri, 2 Sep 2011 07:34:25 +0000 (09:34 +0200)]
debugger: fix optical glitch for first instruction in disassembled function
Change-Id: I956e4b7b8afee843e1a282a0b8488fa9465faf06
Reviewed-on: http://codereview.qt.nokia.com/4117
Reviewed-by: hjk <qthjk@ovi.com>
Marco Bubke [Thu, 1 Sep 2011 12:31:01 +0000 (14:31 +0200)]
QmlDesigner.NodeInstances: Fix crash for dot properties
Change-Id: I5fcecd6fb1e50220053b2769e549f62203f33a06
Reviewed-on: http://codereview.qt.nokia.com/4075
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
hjk [Thu, 1 Sep 2011 16:56:07 +0000 (18:56 +0200)]
debugger: handle display of arm neon register contents
Change-Id: I904dd74f3fd2ecdfea677c23147b1edb057c1aab
Reviewed-on: http://codereview.qt.nokia.com/4100
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Thu, 1 Sep 2011 14:36:27 +0000 (16:36 +0200)]
debugger: slightly saner behaviour for the threads combobox
Change-Id: I20400b037f00a5dbaf11cbbfb184a5bf526883cc
Reviewed-on: http://codereview.qt.nokia.com/4095
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Thu, 1 Sep 2011 13:48:07 +0000 (15:48 +0200)]
debugger: remove dead code
Change-Id: I1b06ed78d3942607543a0b18eba8c369c15d5e22
Reviewed-on: http://codereview.qt.nokia.com/4085
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Thu, 1 Sep 2011 13:07:19 +0000 (15:07 +0200)]
debugger: re-enable thread naming feature
Change-Id: If7c712f24c5e8912cf6028fb98d4984f66502cb3
Reviewed-on: http://codereview.qt.nokia.com/4081
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kandeler [Thu, 1 Sep 2011 09:30:17 +0000 (11:30 +0200)]
RemoteLinux: Only source remote files when they exist.
Change-Id: I644ee25117ebc3fdbd525e6fe62b5541b85dd221
Reviewed-on: http://codereview.qt.nokia.com/4069
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Shane Bradley [Wed, 31 Aug 2011 03:25:36 +0000 (13:25 +1000)]
qttest: Fix updating test view when changes happen in Projects
Change-Id: I9ee4ca7643ffd04dbf466412c71ec5471de1eb1c
Reviewed-on: http://codereview.qt.nokia.com/3904
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kamm [Thu, 1 Sep 2011 07:23:08 +0000 (09:23 +0200)]
QmlJS: Introduce chunk-wise result reporting in semantic highlighter.
Change-Id: I18fcea6c548bb0610db196b4aead8c4d52b40171
Reviewed-on: http://codereview.qt.nokia.com/4043
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Thu, 1 Sep 2011 07:22:50 +0000 (09:22 +0200)]
C++: Clean up semantic highlighter chunking code.
Change-Id: I5398442bdb864c4bccd8c193364bed3879bbc660
Reviewed-on: http://codereview.qt.nokia.com/4042
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
hjk [Thu, 1 Sep 2011 08:28:32 +0000 (10:28 +0200)]
debugger: robustify QFile* dumpers
Change-Id: Ic5ec62a484b2d7c71664e86b7f1f38c582492811
Reviewed-on: http://codereview.qt.nokia.com/4051
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Fri, 26 Aug 2011 11:11:12 +0000 (13:11 +0200)]
C++ function link: Don't add name if name is commented.
Change-Id: Ibc38898585f6e5be625ccfc0e1304ccb44a7f167
Reviewed-on: http://codereview.qt.nokia.com/3955
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Thu, 1 Sep 2011 07:17:27 +0000 (09:17 +0200)]
qmlpuppet: Fix build with Qt 4.7.4.
Change-Id: I74f0784d76f8fa7137db22a251deaab9d99481dd
Reviewed-on: http://codereview.qt.nokia.com/4040
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Shane Bradley [Thu, 1 Sep 2011 01:10:34 +0000 (11:10 +1000)]
qttest: Disable default load of plugin til parsing times are improved
Change-Id: Ib29cae27ec9666d31df571a9c87dfc2a24644f09
Reviewed-on: http://codereview.qt.nokia.com/4020
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Kai Koehne [Wed, 31 Aug 2011 10:55:08 +0000 (12:55 +0200)]
QmlJSDebugger: Merge back changes done to the files in qtdeclarative
Change-Id: I722b191035757c60ce103edf74517f5348a91955
Reviewed-on: http://codereview.qt.nokia.com/3945
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Marco Bubke [Wed, 31 Aug 2011 16:19:45 +0000 (18:19 +0200)]
QmlDesigner.NodeInstances: Create effect items only in the render process
Change-Id: I0506bf898582ba8e26a22f51737eae4d82f06c63
Reviewed-on: http://codereview.qt.nokia.com/4004
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Wed, 31 Aug 2011 16:27:41 +0000 (18:27 +0200)]
QmlDesigner.NodeInstances: Fix header
Change-Id: Ib272d772f6e8838b71c6ede8222acae4313ecae2
Reviewed-on: http://codereview.qt.nokia.com/4009
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Wed, 31 Aug 2011 16:22:42 +0000 (18:22 +0200)]
QmlDesigner.NodeInstances: Fix frame dropping for last frame
Change-Id: Ie8c66c55f0236043441043727f31c9040a5dfc3d
Reviewed-on: http://codereview.qt.nokia.com/4008
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Wed, 31 Aug 2011 16:22:26 +0000 (18:22 +0200)]
QmlDesigner.NodeInstances: Fix frame dropping for last frame
Change-Id: Id70b1bc0af09293628fe2242f4bebeb30c1ae230
Reviewed-on: http://codereview.qt.nokia.com/4007
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Wed, 31 Aug 2011 16:21:24 +0000 (18:21 +0200)]
QmlDesigner.NodeInstances: Preview images for Qml2
Change-Id: I00ba96458ab8cb2e9d9766e1ecfeaea15bf2e040
Reviewed-on: http://codereview.qt.nokia.com/4006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Wed, 31 Aug 2011 16:20:25 +0000 (18:20 +0200)]
QmlDesigner.NodeInstances: Add sgitem getter to the server node instance
Change-Id: I58baee2a8e59f2cef8add0472a3ee0c2a13fd59a
Reviewed-on: http://codereview.qt.nokia.com/4005
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Wed, 31 Aug 2011 12:31:05 +0000 (14:31 +0200)]
QmlDesigner.NodeInstances: Use v8 private headers
Change-Id: I4c0d8e08a22ee0c5b2602cc7d877071010fd9f88
Reviewed-on: http://codereview.qt.nokia.com/3976
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Marco Bubke [Wed, 31 Aug 2011 12:30:22 +0000 (14:30 +0200)]
QmlDesigner.NodeInstances: Provide bounding rectangle for render image
Change-Id: If1d8e51109eec5e281a1cecdaff7c081a5e6d95d
Reviewed-on: http://codereview.qt.nokia.com/3975
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Marco Bubke [Wed, 31 Aug 2011 12:28:48 +0000 (14:28 +0200)]
QmlDesigner.NodeInstances: Refactoring dirty to isDirty
Change-Id: I6344632a8570ad09e38c7d3dc093c42d758bf15a
Reviewed-on: http://codereview.qt.nokia.com/3974
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Marco Bubke [Wed, 31 Aug 2011 12:27:56 +0000 (14:27 +0200)]
QmlDesigner.NodeInstances: Add support for new list interface
Change-Id: Icd20f2a921c94f8bac73f9f61b61a34561ee2d3f
Reviewed-on: http://codereview.qt.nokia.com/3973
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Marco Bubke [Mon, 29 Aug 2011 18:55:49 +0000 (20:55 +0200)]
QmlDesigner.NodeInstances: Fix image rendering
Call DesignerSupport::updateDirtyNode() recursively for every item which is
not under our control.
Change-Id: Ie6c784965d1557ece81176fc405864f1328733f7
Reviewed-on: http://codereview.qt.nokia.com/3972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Mon, 29 Aug 2011 18:54:14 +0000 (20:54 +0200)]
QmlDesinger.NodeInstances: Fix bounding rectangle calculation
Change-Id: Ia0633416e50da68377a781050e301e5721540d6b
Reviewed-on: http://codereview.qt.nokia.com/3971
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Mon, 29 Aug 2011 18:51:43 +0000 (20:51 +0200)]
QmlDesigner.NodeInstances: Fix function call to parent class
Change-Id: I4842b91c53b3d9f0b0bc6a950858ce482b173d1b
Reviewed-on: http://codereview.qt.nokia.com/3970
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Mon, 29 Aug 2011 18:50:57 +0000 (20:50 +0200)]
QmlDesigner.NodeInstances: Remove unused code
Change-Id: Ibf585ef6f821f73be16888fea550bfe0e0b1bcd6
Reviewed-on: http://codereview.qt.nokia.com/3969
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Mon, 29 Aug 2011 14:42:34 +0000 (16:42 +0200)]
QmlDesigner.NodeInstances: Remove Qt5 guards
Change-Id: Ia740b2818dcc287ff82991ae317bcf644c4c0c2a
Reviewed-on: http://codereview.qt.nokia.com/3968
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Marco Bubke [Thu, 25 Aug 2011 18:51:29 +0000 (20:51 +0200)]
QmlDesigner.NodeInstances: Improve SceneGraph support
Change-Id: Ia5111f972836a1123fe857511325a82aef855449
Reviewed-on: http://codereview.qt.nokia.com/3967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Tobias Hunger [Wed, 31 Aug 2011 15:20:28 +0000 (15:20 +0000)]
ABI: Add one more unit test
Change-Id: I1037473a1027a10213151046aedea0e61ff278a3
Reviewed-on: http://codereview.qt.nokia.com/4001
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Tobias Hunger [Wed, 31 Aug 2011 15:09:18 +0000 (15:09 +0000)]
ABI: fix endian issues
Fix possible endian issues when detecting the ABIs.
Change-Id: I23e29a9bc697f63eb17641540083b34c6059096b
Reviewed-on: http://codereview.qt.nokia.com/4000
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Tobias Hunger [Wed, 31 Aug 2011 11:38:39 +0000 (11:38 +0000)]
ABI: Improve detection of Windows PE
Thanks to Thiago for pointing out the MZ header which points to the
PE header.
Change-Id: I87bcedf368483d60756e1c9b665ffe3a80c47736
Reviewed-on: http://codereview.qt.nokia.com/3998
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Tobias Hunger [Wed, 31 Aug 2011 15:24:24 +0000 (15:24 +0000)]
GCC: Add unit test for dumpmachine parsing
Change-Id: I9be657018f0cb98b0acb8d6139389ab61ebab070
Reviewed-on: http://codereview.qt.nokia.com/4002
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Tobias Hunger [Wed, 31 Aug 2011 11:56:29 +0000 (11:56 +0000)]
Fix warning
Do not hide symbols of base class
Change-Id: If35d662b0ce3680b0a46e47d55564d46c8740625
Reviewed-on: http://codereview.qt.nokia.com/3999
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Tobias Hunger [Wed, 31 Aug 2011 09:55:34 +0000 (09:55 +0000)]
Fix typo in enum name
Change-Id: I5de645197318062f2174e0205bfffc98413f911e
Reviewed-on: http://codereview.qt.nokia.com/3997
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
hjk [Wed, 31 Aug 2011 14:45:44 +0000 (16:45 +0200)]
debugger: prepare support for partial register display
Change-Id: I74e971cfb41afbdd07f4193c14c3bb7ecd634859
Reviewed-on: http://codereview.qt.nokia.com/3990
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Wed, 31 Aug 2011 14:41:18 +0000 (16:41 +0200)]
modeltest: improve debuggability by simpler expressions in asserts
Change-Id: I48286b73510bcbd303eedead69566d8bb776fe42
Reviewed-on: http://codereview.qt.nokia.com/3989
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Christian Stenger [Wed, 31 Aug 2011 14:05:15 +0000 (16:05 +0200)]
Refactoring build functions, enhancing signal handlers
Added functionality to remove the need to clean settings by yourself
Change-Id: If2d95618d5e77e30480d0ca763ad7ce632f2d094
Reviewed-on: http://codereview.qt.nokia.com/3984
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Bill King [Wed, 31 Aug 2011 11:51:32 +0000 (13:51 +0200)]
Fixes openProject, also tests multiple target selection and building.
Change-Id: I4a5aaea2eca940c3ffcf8458b5cc0afce591b63e
Reviewed-on: http://codereview.qt.nokia.com/3886
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Eike Ziller [Tue, 30 Aug 2011 13:57:00 +0000 (15:57 +0200)]
Merge app_version.h and ide_version.h
Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
hjk [Wed, 31 Aug 2011 11:45:12 +0000 (13:45 +0200)]
dumpers: fix two regressions in std::string and general pointer checking
Change-Id: I971ff4ad425e291c3536bc25ae6ee4933e46a681
Reviewed-on: http://codereview.qt.nokia.com/3957
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Teske [Wed, 31 Aug 2011 10:09:14 +0000 (12:09 +0200)]
Reduce the directories plugins are searched in
Don't search in the mac directories on linux/unix and vice versa.
Orginal patch by Ray Donnelly <mingw.android@laptop.com> on the android
branch.
Change-Id: I57a4d83a94f28bbe00609fd1b9170629da27334e
Reviewed-on: http://codereview.qt.nokia.com/3949
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Daniel Teske [Tue, 30 Aug 2011 14:53:03 +0000 (16:53 +0200)]
Export Qt4ProjectManagerPlugin::MakeStep
Fixes the wrong exporting in
a838d4ac0191de63e3a3a17290ffa6d14457c4d2
Change-Id: I3a56510f6821dd621a099d0345882264527e1059
Reviewed-on: http://codereview.qt.nokia.com/3948
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Leandro Melo [Wed, 31 Aug 2011 09:41:59 +0000 (11:41 +0200)]
C++: Export DiagnosticMessage
This is now necessary due to the recent change
that added the non-inline operator==.
Change-Id: I62255ddeb09f1e312a802db9733575e73ea56478
Reviewed-on: http://codereview.qt.nokia.com/3928
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Shane Bradley [Wed, 31 Aug 2011 04:00:06 +0000 (14:00 +1000)]
qttest: Invalid information shown in test output field
Change-Id: I58d8702b0440566f67074e51a8c4ab74e74b8a48
Reviewed-on: http://codereview.qt.nokia.com/3905
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Christian Kamm [Wed, 31 Aug 2011 07:58:40 +0000 (09:58 +0200)]
QmlJS: Fix infinite loop when scanning for exported C++ types.
Setting extra diagnostics would call updateDocument which would in turn
trigger another scan.
Change-Id: I3810a380cdf716a12767d94ff82dc30f8ae3954d
Reviewed-on: http://codereview.qt.nokia.com/3917
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Wed, 31 Aug 2011 06:43:17 +0000 (08:43 +0200)]
QmlJS: Ensure the C++ model manager is available before using it.
Change-Id: I0cc4e59505a6a5baa585e3748fdf174805d661b1
Reviewed-on: http://codereview.qt.nokia.com/3913
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Robert Loehning [Mon, 29 Aug 2011 11:24:03 +0000 (13:24 +0200)]
Avoid warnings from MSVC 2008
Change-Id: Id8f75c19c8a6609e74900a71013c2fbbdbb3669a
Reviewed-on: http://codereview.qt.nokia.com/3677
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Shane Bradley <shane.bradley@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kamm [Tue, 30 Aug 2011 12:29:40 +0000 (14:29 +0200)]
C++ preprocessor: Fix multiline tokens in ifdef'ed out blocks.
Change-Id: If6f9819565f891e861f9e111423d99caa7c0f7aa
Reviewed-on: http://codereview.qt.nokia.com/3884
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
hjk [Mon, 29 Aug 2011 15:04:57 +0000 (17:04 +0200)]
utils: make QTC_ASSERT output compatible with outputpane parser
Change-Id: Icdb423ec16b06538446aac4d248726dae8af97f1
Reviewed-on: http://codereview.qt.nokia.com/3874
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Eike Ziller [Tue, 30 Aug 2011 13:59:07 +0000 (15:59 +0200)]
Merge remote-tracking branch 'origin/2.3'
Conflicts:
doc/qtcreator.qdoc
qtcreator.pri
Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
Christian Kamm [Tue, 30 Aug 2011 10:40:36 +0000 (12:40 +0200)]
QmlJS: Change default semantic highlighting colors.
Done-with: Carsten Owerfeldt
Change-Id: I4705a4e35bd0bbd73200332d86854dbd34cb70c4
Reviewed-on: http://codereview.qt.nokia.com/3877
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Tue, 30 Aug 2011 08:52:41 +0000 (10:52 +0200)]
C++ semantic highlighting: Report uses sorted by line.
This moves sorting from the gui thread to the future and
allows the incremental application of the extra formats
to assume chunks are sorted.
Change-Id: I38e179e573c43cc955cce820f17ac87e3300a839
Reviewed-on: http://codereview.qt.nokia.com/3869
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Leena Miettinen [Tue, 30 Aug 2011 09:45:08 +0000 (11:45 +0200)]
Doc: add source for Transitions example
Change-Id: I20e477be4cad782dac3946f18c3067a45579388e
Reviewed-on: http://codereview.qt.nokia.com/3816
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
hjk [Tue, 30 Aug 2011 08:52:24 +0000 (10:52 +0200)]
modeltest: compile fix
Change-Id: I1c10d8cdf21e4cbd32d4cd84d14247e7f84b1cce
Reviewed-on: http://codereview.qt.nokia.com/3876
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Tue, 30 Aug 2011 08:49:43 +0000 (10:49 +0200)]
debugger: remove some old test code
Change-Id: I899cc0ac4e130ceeb08c474ee255fbe2613c2e6b
Reviewed-on: http://codereview.qt.nokia.com/3875
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Fri, 26 Aug 2011 15:13:14 +0000 (17:13 +0200)]
qttest: compile fix with namespaces
Change-Id: I2ea20b66fc68e6d3084e1c8b184d47df7ca49177
Reviewed-on: http://codereview.qt.nokia.com/3873
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Wed, 24 Aug 2011 08:55:48 +0000 (10:55 +0200)]
C++/QmlJS: Warnings if C++ based QML type detection fails.
Change-Id: I1e206e09c4068cc541978ee148f9ed8c4138c249
Reviewed-on: http://codereview.qt.nokia.com/3579
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Wed, 24 Aug 2011 07:47:54 +0000 (09:47 +0200)]
QmlJS: Scan for '// @uri Foo' annotations next to qmlRegisterType.
Change-Id: I9586bfd9f048005d62368a02a314ded924cb7254
Reviewed-on: http://codereview.qt.nokia.com/3482
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Christian Kamm [Fri, 26 Aug 2011 11:31:18 +0000 (13:31 +0200)]
QmlJS: Ensure project infos are removed when a project closes.
As a side effect, this removes parse errors of QML files that are no
longer in any project from the "Build Issues" list.
Change-Id: I7aef8850a207ac060648dc92e2dd759108b71731
Reviewed-on: http://codereview.qt.nokia.com/3668
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Roberto Raggi [Tue, 30 Aug 2011 09:06:24 +0000 (11:06 +0200)]
Regenerate the default AST visitors.
Change-Id: I429c9d454a1b896abf642225ef7b506481fac708
Reviewed-on: http://codereview.qt.nokia.com/3867
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Roberto Raggi [Tue, 30 Aug 2011 09:05:33 +0000 (11:05 +0200)]
Added code generators for ASTVisitor.h and ASTMatcher.h
Change-Id: I9d18224699034150eee13249ec90e0747afe0814
Reviewed-on: http://codereview.qt.nokia.com/3866
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Christian Kamm [Tue, 30 Aug 2011 08:05:09 +0000 (10:05 +0200)]
C++: Set property on CppEditorWidget when in function link.
To allow FakeVim to pick up on the state and pass through Enter/Return.
Change-Id: Ia203a1b3fa8877d90cbaf4b46183bb01a6de1362
Reviewed-on: http://codereview.qt.nokia.com/3856
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Tue, 30 Aug 2011 07:19:56 +0000 (09:19 +0200)]
QmlJS: Improve ModelManagerInterface API, add docs.
Change-Id: Ic65d767cbad85de89dffaac66d9e80d8d467f04a
Reviewed-on: http://codereview.qt.nokia.com/3851
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Mon, 29 Aug 2011 07:53:52 +0000 (09:53 +0200)]
C++ insert def: Insert next to surrounding definitions.
Change-Id: I1bef659084727d7fe69670c991ee5efe2be66497
Reviewed-on: http://codereview.qt.nokia.com/3713
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Tobias Hunger [Mon, 29 Aug 2011 14:38:51 +0000 (14:38 +0000)]
Fix warning
Change-Id: I21d6ec20ba32c8572b68fd7e5eeadbc49abe74c4
Reviewed-on: http://codereview.qt.nokia.com/3821
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Tobias Hunger [Mon, 29 Aug 2011 14:31:18 +0000 (14:31 +0000)]
Remove test of Qt4 project loading
This test is broken for a long time now and the squish tests cover
this functionality.
Change-Id: I5ec598da8d2b9fec304a6df76509fa66318a6c2b
Reviewed-on: http://codereview.qt.nokia.com/3820
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>