OSDN Git Service
Eike Ziller [Fri, 16 Sep 2011 08:44:32 +0000 (10:44 +0200)]
Merge remote-tracking branch 'origin/2.3'
Eike Ziller [Thu, 15 Sep 2011 15:50:52 +0000 (17:50 +0200)]
Make linux devices configuration less huge.
Change-Id: I2dbf049eb97842ed6b72e05f8d7b1e91d08996d1
Reviewed-on: http://codereview.qt-project.org/5021
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Christian Kamm [Fri, 16 Sep 2011 07:50:17 +0000 (09:50 +0200)]
SemanticHighlighter: Fix off-by-one in assert.
Change-Id: Ie9331d233894e49cf86605819687eeef765272df
Reviewed-on: http://codereview.qt-project.org/5067
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kandeler [Thu, 15 Sep 2011 13:49:21 +0000 (15:49 +0200)]
Harmattan: Don't overwrite manifest file when opening project.
Task-number: QTCREATORBUG-6117
Change-Id: I53bf05340ee20596f4a2a5cfee81735f037b22cb
Reviewed-on: http://codereview.qt-project.org/5011
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Leena Miettinen [Thu, 15 Sep 2011 15:24:02 +0000 (17:24 +0200)]
Doc: update screenshot
Task-number: QTCREATORBUG-5970
Change-Id: Iaccefa8583e94a42c59ea658d474401a378dcce7
Reviewed-on: http://codereview.qt-project.org/5019
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Thu, 15 Sep 2011 15:12:48 +0000 (17:12 +0200)]
Doc: Qt support on devices
Change-Id: Ida0eea494e3362a7dcf1df9dd5ac915c61af2524
Reviewed-on: http://codereview.qt-project.org/5018
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Aurindam Jana [Thu, 15 Sep 2011 12:45:17 +0000 (14:45 +0200)]
QMLProject: Pick the correct QMLViewer depending on Qt Version
Change-Id: Ice9fa1294f29e1376afbf7af1a112e7d99a44b10
Reviewed-on: http://codereview.qt-project.org/4998
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Daniel Molkentin [Thu, 15 Sep 2011 11:56:16 +0000 (13:56 +0200)]
Include qmldesigner plugins in "make install"
Task-Number: QTCREATORBUG-6115
Change-Id: I433f5dafbdf6fc4fe49c43a7e750d1f353b4ea58
Reviewed-on: http://codereview.qt-project.org/4988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
hjk [Thu, 15 Sep 2011 13:05:03 +0000 (15:05 +0200)]
debugger: mark optimized out values as such
Change-Id: I57fedc5a2525e7e520e9ba8586e5d5f3eb4da091
Reviewed-on: http://codereview.qt-project.org/5005
Reviewed-by: hjk <qthjk@ovi.com>
Thomas Hartmann [Thu, 15 Sep 2011 12:07:17 +0000 (14:07 +0200)]
crumblePath: adding dataForLastIndex()
Change-Id: I0e9a856ab3bea80b730ba30d343c5ab88df83db2
Reviewed-on: http://codereview.qt-project.org/4991
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lasse Holmstedt
Tobias Hunger [Fri, 9 Sep 2011 09:54:37 +0000 (09:54 +0000)]
qmake: Warn when using a mkspec that might not work with the tool chain
Warn when using a mkspec that might or might not work with the selected
tool chain.
Task-number: QTCREATORBUG-5854
Change-Id: Ifead5108ccd109f66707ad7aa371daead8cb57e7
Reviewed-on: http://codereview.qt-project.org/4522
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Thu, 15 Sep 2011 11:42:38 +0000 (13:42 +0200)]
utils, qmljstools, vcsbase: s/\bm_d\b/d/g
Change-Id: I4678e9188b8f630aa3a3221be348984cdc7699dd
Reviewed-on: http://codereview.qt-project.org/4992
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Thu, 15 Sep 2011 11:43:34 +0000 (13:43 +0200)]
QmlJS: When completing enums, add Item.Foo instead of "Foo".
Change-Id: I9a74bd726d9691ca93477916159a80c04c35f52d
Reviewed-on: http://codereview.qt-project.org/4987
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Kai Koehne [Wed, 14 Sep 2011 11:12:25 +0000 (13:12 +0200)]
QmlProfiler: Re-enable attaching to a (remote) port
Change-Id: Iff5f8cf26e580ede4f82aba5a36acd785521da8d
Reviewed-on: http://codereview.qt-project.org/4890
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
hjk [Thu, 15 Sep 2011 10:42:29 +0000 (12:42 +0200)]
debugger: work on manual test
Change-Id: I6a803c770e8adf27fb7f6227d0d71c20ed0dffcf
Reviewed-on: http://codereview.qt-project.org/4985
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Thu, 15 Sep 2011 09:45:27 +0000 (11:45 +0200)]
qmldesigner: code style
Change-Id: I4088695312de5ea526578c6b901a79a9662797b8
Reviewed-on: http://codereview.qt-project.org/4961
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Thu, 15 Sep 2011 10:15:10 +0000 (12:15 +0200)]
Qt4Project: Update code models if a folder watch changes the file list.
Fixes:
c861af529ec87b34f1ca45d917d367c345334859
Change-Id: I7ed8afd52ab694d053788fac7f3e994898f2dd84
Reviewed-on: http://codereview.qt-project.org/4969
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Thu, 15 Sep 2011 10:13:45 +0000 (12:13 +0200)]
fix 'analyse' in French translation
Change-Id: Ie4edae18de3dd3444a55619d303704a8b13f65bd
Reviewed-on: http://codereview.qt-project.org/4966
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Thu, 15 Sep 2011 10:15:10 +0000 (12:15 +0200)]
Qt4Project: Always notify the code models if the file list changed.
Change-Id: Id795a363c9f990e9506eb35ed5a398948f93cf2f
Reviewed-on: http://codereview.qt-project.org/4967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Orgad Shaneh [Thu, 15 Sep 2011 10:16:30 +0000 (12:16 +0200)]
Process Stub: Release file handle
Task-number: QTCREATORBUG-5382
Merge-request: 388
Reviewed-by: ossi
Change-Id: Ie80fdbe2eadb55d3b5684ebc7a79162317d1a36b
Eike Ziller [Thu, 15 Sep 2011 07:57:18 +0000 (09:57 +0200)]
Fix crash with multiple search results.
Fixes a crash when having the oldest search result open while initiating
a new search (e.g. find usages).
Change-Id: I825266b28daaf472e48299a51719a058af7bba6e
Reviewed-on: http://codereview.qt-project.org/4952
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Kai Koehne [Thu, 15 Sep 2011 09:28:05 +0000 (11:28 +0200)]
Debugger: Make sure cpptools is compiled first
debugger links against cpptools library
Change-Id: I9c1435cf1511f2962e11b5ef488b9764024aa7f1
Reviewed-on: http://codereview.qt-project.org/4959
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Eike Ziller [Thu, 15 Sep 2011 09:50:29 +0000 (11:50 +0200)]
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
qtcreator.pro
share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
src/plugins/remotelinux/remotelinuxruncontrol.cpp
Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
Christian Kandeler [Thu, 15 Sep 2011 07:10:10 +0000 (09:10 +0200)]
Coding style: Pure virtual functions, private implementation pointers.
Change-Id: I293f8dbd4e467e866bab381841659a07e32b9d90
Reviewed-on: http://codereview.qt-project.org/4948
Reviewed-by: hjk <qthjk@ovi.com>
Leandro Melo [Wed, 14 Sep 2011 14:22:45 +0000 (16:22 +0200)]
Code assist: Fix doxygen completion
When the assist interface is detached the correct thing to do
is to clone the document, not simply to copy the text content.
Then data like the user state is preserved.
For the particular issue below, the problem is that the simple
lexer doesn't have the correct initial state and thus cannot
identify its inside a comment.
Task-number: QTCREATORBUG-6061
Change-Id: I59380eeb229e322bafb1e799d649df90327c0f54
Reviewed-on: http://codereview.qt-project.org/4912
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Leena Miettinen [Wed, 14 Sep 2011 15:43:27 +0000 (17:43 +0200)]
Doc: add screen shot
Change-Id: I00b48066026929ef1773f8c231ee1c57e45f8f9e
Reviewed-on: http://codereview.qt-project.org/4925
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Sergey Belyashov [Wed, 14 Sep 2011 15:38:47 +0000 (17:38 +0200)]
Updated Russian translation
Merge-request: 384
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I73077a68f3c674f32198a71eeafc60115f2465cc
Leena Miettinen [Wed, 14 Sep 2011 15:09:53 +0000 (17:09 +0200)]
Doc: update Symbian information for Anna and Belle
Change-Id: I7b59d10ceed278a98b6c7d3e99b87ca4986d8e20
Reviewed-on: http://codereview.qt-project.org/4921
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Wed, 14 Sep 2011 15:09:20 +0000 (17:09 +0200)]
Doc: update screen shot after Forum Nokia was renamed Nokia Developer
Change-Id: I4c9e39c04e9773de2b239277e99ccbdd8be5e6e6
Reviewed-on: http://codereview.qt-project.org/4920
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Leena Miettinen [Wed, 14 Sep 2011 14:36:18 +0000 (16:36 +0200)]
Doc: separate MeeGo and Maemo instructions
Change-Id: I2c7a9bce7ee92c59f91fa41f732f3c90a9e100e3
Reviewed-on: http://codereview.qt-project.org/4886
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
hjk [Wed, 14 Sep 2011 15:01:57 +0000 (17:01 +0200)]
debugger: better remote debugging
Add option to specify location of debug information to dialog.
Default is sysroot + usr/lib/debug.
Change-Id: I8c2ab448f4aba9385da617d23419e521e3ae263c
Reviewed-on: http://codereview.qt-project.org/4919
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kandeler [Thu, 1 Sep 2011 11:23:29 +0000 (13:23 +0200)]
RemoteLinux: Allow deploying to and running on non-Linux unices.
Change-Id: Ib8b8648cc93c37415e0cdb9785f47afbf04e781e
Reviewed-on: http://codereview.qt-project.org/4070
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
hjk [Wed, 14 Sep 2011 13:22:08 +0000 (15:22 +0200)]
debugger: split the 'start and debug remote' and 'attach to remote' cases ui-wise
Change-Id: I229ba996bfe2b38fb30891cdad5f62b6fe430443
Reviewed-on: http://codereview.qt-project.org/4898
Reviewed-by: hjk <qthjk@ovi.com>
Tobias Hunger [Wed, 14 Sep 2011 11:50:37 +0000 (11:50 +0000)]
HG: Use -A when commiting
Fixes commiting of untracked files.
Change-Id: I7111ed8a74ce80876a2ec2220ceace6f7aa77373
Reviewed-on: http://codereview.qt-project.org/4892
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
hjk [Wed, 14 Sep 2011 09:12:18 +0000 (11:12 +0200)]
fakevim: mention comma escape in documentation
Change-Id: I3f62b7073c3bafc37420ee447465a904070a1515
Reviewed-on: http://codereview.qt-project.org/4880
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
cerf [Wed, 14 Sep 2011 09:13:44 +0000 (09:13 +0000)]
vcsbase: add mechanism to ease management of VCS settings
Management of VCS settings was rather laborious (see BazaarSettings,
GitSettings, ...).
To overcome this, the base class VCSBaseClientSettings is now
equipped with a mechanism factorizing redundant code for VCS settings,
like operator=(), operator==(), writeSettings(), ...
Heir classes of VCSBaseClientSettings only need to declare the
settings (key + default value).
Bazaar and Mercurial plugins are impacted.
Change-Id: I7e4093a6d9476f3c8954f4d104f1b26ac185beb9
Merge-request: 2204
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/4889
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
hjk [Wed, 14 Sep 2011 11:00:58 +0000 (13:00 +0200)]
debugger: fix hex input when changing register values
Change-Id: I198e1631d488aff9250e3438ed2fade5aa89968b
Reviewed-on: http://codereview.qt-project.org/4888
Reviewed-by: hjk <qthjk@ovi.com>
hjk [Wed, 14 Sep 2011 10:53:17 +0000 (12:53 +0200)]
debugger: allow partial updates to the register set
Change-Id: Iafa2f9a235e3c44e0d225a1700a9c4d202f13959
Reviewed-on: http://codereview.qt-project.org/4887
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Wed, 14 Sep 2011 09:59:15 +0000 (11:59 +0200)]
QmlJS highlighter: Remove unused function.
Change-Id: I7ddf5783402b0a2262be2e0142b4125db2d55cbf
Reviewed-on: http://codereview.qt-project.org/4883
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Tue, 13 Sep 2011 12:29:47 +0000 (14:29 +0200)]
QmlJS: Improve completion of signals.
* Change from Reference to FunctionValue: There was no reason for them
being References as the argument types never need lookup.
* Enumerate in global completion: When you define 'signal foo(int a)'
you now get completion for 'foo' and will get the function argument
hint popup.
Change-Id: Ic348db477a34ba468dfdb690499a9cd8fd605cd2
Reviewed-on: http://codereview.qt-project.org/4774
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Leandro Melo [Wed, 14 Sep 2011 10:14:15 +0000 (12:14 +0200)]
Editor: New option for surrounding auto brackets
Notice that this option already existed in the auto completer. However,
from the user perspective it was synchronized with auto insert brackets.
Task-number: QTCREATORBUG-5835
Change-Id: Ia87a2ca38d89dba51380a4fdb58a5a3689ed9265
Reviewed-on: http://codereview.qt-project.org/4885
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Teske [Thu, 8 Sep 2011 17:41:02 +0000 (19:41 +0200)]
Support returning 0 from RunConfiguration::createConfigurationWidget
The android plugin does so.
Change-Id: If5e5216bbcb6ba3dcd4186ae4c558efe4d56dcb8
Reviewed-on: http://codereview.qt-project.org/4882
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Christian Kamm [Mon, 12 Sep 2011 12:00:05 +0000 (14:00 +0200)]
QmlJS highlighting: Use semantics for types and binding names.
This fixes some problems with highlighting like anchors {}, allows us
to only highlight correct types and to make the binding name formatting
customizable.
Change-Id: I7ab0c0ed384108b74a2998796d868d5ced4a5310
Reviewed-on: http://codereview.qt-project.org/4669
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Tue, 13 Sep 2011 08:09:14 +0000 (10:09 +0200)]
QmlJS: Simplify check if a document instantiates a component.
Change-Id: If45002ecec56ca766ef7a0c7878c0a48fadee452
Reviewed-on: http://codereview.qt-project.org/4734
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Christian Kamm [Tue, 13 Sep 2011 07:57:24 +0000 (09:57 +0200)]
QmlJS: Adjust existing code for updated QML parser.
Change-Id: I153723eeb9973be025daf47e317f7b9d076a3c72
Reviewed-on: http://codereview.qt-project.org/4733
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Tue, 13 Sep 2011 06:42:52 +0000 (08:42 +0200)]
QmlJS: Merge parser updates from Qt5.
Change-Id: Ibed38abca8f7e7bae7d424751a18c83f4c9e9bc5
Reviewed-on: http://codereview.qt-project.org/4732
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Christian Kamm [Wed, 14 Sep 2011 09:17:43 +0000 (11:17 +0200)]
QmlJS tests: Fix compile of 'check' test.
Change-Id: I6cccb55d4c49eb6cf77ac4d1378d3d7adac95a32
Reviewed-on: http://codereview.qt-project.org/4881
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Kai Koehne [Wed, 14 Sep 2011 08:21:37 +0000 (10:21 +0200)]
ProjectExplorer: Fix potential crash when removing files
Change-Id: I0973d92ae5bdcc89482a55f011d55bc7383b757b
Task-number: QTCREATORBUG-5961
Reviewed-on: http://codereview.qt-project.org/4877
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Kai Koehne [Thu, 1 Sep 2011 14:16:59 +0000 (16:16 +0200)]
QMakeStep: Honor declarative_debug configuration for imported builds
Honor the qmake line that is imported: If it contains declarative_debug
or QMLJSDEBUGGER_PATH, also set the option in the qmake step, if not
not.
Change-Id: Ibc524ff8d39b66f76cc79807264db0dd3534e2d7
Reviewed-on: http://codereview.qt-project.org/4090
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Kai Koehne [Thu, 1 Sep 2011 14:14:21 +0000 (16:14 +0200)]
QMakeStep: Move recompilation dialog to QMakeStepConfigWidget
Change-Id: I20576fa99d9a1d04c24f9615317663e943619200
Reviewed-on: http://codereview.qt-project.org/4089
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Aurindam Jana [Tue, 6 Sep 2011 15:03:16 +0000 (17:03 +0200)]
JSDebugger: Break on Exception
The debugger breaks on Javascript exception. The error message is
printed on the ScriptConsole and the relevant code is marked with
a wavy underline.
Change-Id: I5e6f603430c3b8a0db450d1e8c821714ec0140ab
Reviewed-on: http://codereview.qt-project.org/4276
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Christian Kamm [Mon, 12 Sep 2011 10:42:41 +0000 (12:42 +0200)]
QmlJS checks: Add tests.
Change-Id: I37852b7b4f1720c276fc3aea3b1892613028ec48
Reviewed-on: http://codereview.qt-project.org/4658
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Mon, 12 Sep 2011 08:44:11 +0000 (10:44 +0200)]
QmlJS checks: Correct the check for dangerous == and add tests.
Change-Id: Ie0f4062069bf241020868af34ce6d36146b4b0c7
Reviewed-on: http://codereview.qt-project.org/4646
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Fri, 9 Sep 2011 13:49:05 +0000 (15:49 +0200)]
QmlJS: Add infrastructure for tests of QML static checker.
Change-Id: Idf49bc0c29ad82456a5fe65e2acced6a4fb130fc
Reviewed-on: http://codereview.qt-project.org/4552
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Tue, 13 Sep 2011 11:32:29 +0000 (13:32 +0200)]
QmlJS: Cleanup Link.
* Don't use Qt macros for d-ptr.
* Move private functions to LinkPrivate.
Change-Id: Icb6f579e9168dd9bf5cccec1255fda1939e47c9a
Reviewed-on: http://codereview.qt-project.org/4767
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Wed, 14 Sep 2011 07:28:49 +0000 (09:28 +0200)]
QmlJS: Enable 'follow symbol' for local variables.
Task-number: QTCREATORBUG-6094
Change-Id: Icf286bc412b48dbd1cb38c47ad7b91040b5aae0f
Reviewed-on: http://codereview.qt-project.org/4864
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Aurindam Jana [Tue, 13 Sep 2011 15:26:02 +0000 (17:26 +0200)]
QmlDebugger: Added dialog "Attach to QML Port..."
The dialog is added to Debug->Start Debugging menu option. It specifies the host
and port that the JSDebugClient connects to for listening to debug messages.
Change-Id: I7f828c169ff2338f4780025f72182c5fc8784c4a
Reviewed-on: http://codereview.qt-project.org/4824
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Christian Kamm [Fri, 9 Sep 2011 12:56:12 +0000 (14:56 +0200)]
QmlJS tests: Make basic test pass again.
Change-Id: Iff7d36e7c7908b267fc02cd46e3f2a173ef5c7b9
Reviewed-on: http://codereview.qt-project.org/4547
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Fri, 9 Sep 2011 11:56:41 +0000 (13:56 +0200)]
QmlJS: Improve import error messages.
Change-Id: Ief305b787fbc4577acfdec41083bc72e178db46d
Reviewed-on: http://codereview.qt-project.org/4537
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Wed, 7 Sep 2011 11:30:48 +0000 (13:30 +0200)]
QmlJS indenter: Fix labelled statements and break/continue with label.
Also do some cleanup to make handling of substatements nicer.
Change-Id: I78773fc81d9b0058fa97c5cef393cca34b7fd885
Reviewed-on: http://codereview.qt-project.org/4413
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Wed, 14 Sep 2011 07:59:05 +0000 (09:59 +0200)]
QmlJS highlighting: Fix external object property highlight.
Change-Id: Ie9fa9aceb72c40ca2f991f48f70f89e5ab342436
Reviewed-on: http://codereview.qt-project.org/4870
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Wed, 7 Sep 2011 05:21:38 +0000 (07:21 +0200)]
QmlJS checks: Add 'unreachable code' warnings.
Change-Id: I59e490adce5c0cd7784894a0f9d4435cdcbc9b23
Reviewed-on: http://codereview.qt-project.org/4332
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Eike Ziller [Fri, 9 Sep 2011 14:10:57 +0000 (16:10 +0200)]
Keep multiple search results in history.
Change-Id: I7350c78479343e85b1ca4957e08bccefb5756d20
Reviewed-on: http://codereview.qt-project.org/4556
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Tobias Hunger [Tue, 13 Sep 2011 15:05:50 +0000 (15:05 +0000)]
VCS: Make initialization of a repo trigger updateActions
Make initialization/cloning of a repo trigger an updateActions.
This is needed to e.g. enable git actions after a git repo is created.
Reviewed-by: Hugues Delorme
Change-Id: Ia8513a216e584fe8e512fdd5d6215aa96c075f3f
Reviewed-on: http://codereview.qt-project.org/4878
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Christian Kamm [Wed, 14 Sep 2011 08:42:23 +0000 (10:42 +0200)]
C++ function signature: Don't try to reuse nonexistant context.
Change-Id: I890cccc25c5ba774691edee860845e22a7b7ec78
Reviewed-on: http://codereview.qt-project.org/4876
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Kai Koehne [Tue, 13 Sep 2011 15:05:51 +0000 (17:05 +0200)]
QmlProfiler: Fix help output
Change-Id: I52aca06921ae45ad0103d672ede569cbbce09eea
Reviewed-on: http://codereview.qt-project.org/4800
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
hjk [Tue, 13 Sep 2011 16:18:22 +0000 (18:18 +0200)]
debugger: Use the 'r' format to read register contents.
One wart less.
Change-Id: Iff86c93308a4e4d93a55139940aff2e26edc1e1f
Reviewed-on: http://codereview.qt-project.org/4827
Reviewed-by: hjk <qthjk@ovi.com>
Oswald Buddenhagen [Tue, 13 Sep 2011 14:26:07 +0000 (16:26 +0200)]
don't try to strip the wrapper script
yet another hack
Change-Id: Ic041e8bdfb7331d6934620c8fbb91435f3495ba7
Reviewed-on: http://codereview.qt-project.org/4790
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Kai Koehne [Tue, 13 Sep 2011 14:43:06 +0000 (16:43 +0200)]
Add changes-2.4.0 file
Change-Id: Ic6b59e9a40134b1e37e64170bcf12388c535014a
Reviewed-on: http://codereview.qt-project.org/4794
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Kai Koehne [Tue, 13 Sep 2011 14:36:31 +0000 (16:36 +0200)]
qtpromaker: Fix typo in help
Change-Id: I77b5448cc19451944ec70fa5394c3f534dfcad7b
Eike Ziller [Fri, 9 Sep 2011 06:46:51 +0000 (08:46 +0200)]
Move advanced search dialog into search result pane.
And move the cancel button into the specific search result widget.
Change-Id: Ide8173e1ec5de091e1c1332a2b0c47d9a30a4c87
Reviewed-on: http://codereview.qt-project.org/4555
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Eike Ziller [Wed, 7 Sep 2011 18:28:04 +0000 (20:28 +0200)]
Show more info about a search and move UI for replacing
Change-Id: I6e024583c0d778a65007eb4590118c4329b2118a
Reviewed-on: http://codereview.qt-project.org/4554
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kamm [Tue, 13 Sep 2011 09:07:37 +0000 (11:07 +0200)]
C++ function signature: Add shortcut to marker tooltip.
Change-Id: Ied3268bb624df4201ca42beb76d20b9a638d5918
Reviewed-on: http://codereview.qt-project.org/4746
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Mon, 12 Sep 2011 13:02:30 +0000 (15:02 +0200)]
C++: Don't jump to change when applying function signature quickfix.
Change-Id: I93abf773717b3f82fc6fa15e1916f48bc3edec95
Reviewed-on: http://codereview.qt-project.org/4675
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Kai Koehne [Mon, 12 Sep 2011 14:59:21 +0000 (16:59 +0200)]
QML Debugging: Fix crash for QML-only debugging on Symbian
Task-number: QTCREATORBUG-6037
Change-Id: I01080d97d21c230a7a32ea943435b2f763b87c41
Reviewed-on: http://codereview.qt-project.org/4687
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Christoph Mathys [Tue, 13 Sep 2011 11:14:25 +0000 (13:14 +0200)]
debugger: Add support for threadnames in core file debugging.
The gdb engine now calls thread-info instead of thread-list-ids
when debugging core files and fall back to thread-list-ids if
thread-info does not work. This is now the same behaviour as if
qtcreator is attached to a running process.
Change-Id: I09b8e60fab329d9b65c501e18cd3fd9ceb22f506
Merge-request: 2192
Reviewed-by: hjk <qtc-committer@nokia.com>
Reviewed-on: http://codereview.qt-project.org/4763
Reviewed-by: hjk <qthjk@ovi.com>
Daniel Teske [Tue, 13 Sep 2011 11:12:34 +0000 (13:12 +0200)]
Fix buddy for Utils::PathChooser
Task-number: QTCREATORBUG-4966
Change-Id: I848f8fbdc6fa613e7308bb5700b9cbc305f36c73
Reviewed-on: http://codereview.qt-project.org/4760
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
hjk [Tue, 13 Sep 2011 07:54:37 +0000 (09:54 +0200)]
fakevim: string literals
Change-Id: I17b78751a161a25b1b1de7018c47e07274f0f438
Reviewed-on: http://codereview.qt-project.org/4756
Reviewed-by: hjk <qthjk@ovi.com>
Orgad Shaneh [Tue, 13 Sep 2011 10:50:33 +0000 (12:50 +0200)]
Dumper: Fixed wrong function call
Merge-request: 383
Reviewed-by: hjk <qtc-committer@nokia.com>
Change-Id: I4d8c60f8877f6771783ba368050b8bce8891ba9e
Reviewed-on: http://codereview.qt-project.org/4757
Reviewed-by: hjk <qthjk@ovi.com>
Christian Kamm [Tue, 13 Sep 2011 09:36:05 +0000 (11:36 +0200)]
C++ function signature: Allow most specifiers to be replaced.
Except for some SimpleSpecifiers and AttributeSpecifiers. Fixes a bug
where NamedTypeSpecifiers would not be replaced when the return type
was adjusted.
Change-Id: Ie093615ebf1b26d181b888fcbcc341e5bdf85fd1
Reviewed-on: http://codereview.qt-project.org/4749
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Marco Bubke [Mon, 12 Sep 2011 14:52:54 +0000 (16:52 +0200)]
Wizards: Refactor GeneratedFile in a extra file
Change-Id: I58f7053405c79774154c2f0447944533e6b10152
Reviewed-on: http://codereview.qt-project.org/4685
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
hjk [Mon, 12 Sep 2011 13:16:27 +0000 (15:16 +0200)]
fakevim: make toggle action scriptable
Change-Id: Ic089b91db144389bac4967a6c4f8be361b1a3bda
Reviewed-on: http://codereview.qt-project.org/4730
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Robert Loehning [Mon, 12 Sep 2011 13:48:43 +0000 (15:48 +0200)]
Fixed operator precedence
Change-Id: I8482915ac8218d6575fb4c51dbcf0d1fcd0d60e4
Reviewed-on: http://codereview.qt-project.org/4681
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Robert Loehning [Mon, 12 Sep 2011 13:07:05 +0000 (15:07 +0200)]
Removed unused constant
Change-Id: I5a58bb3f4a5be240d1e4b59ad8a592699f35af93
Reviewed-on: http://codereview.qt-project.org/4676
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Thomas Hartmann [Mon, 12 Sep 2011 12:59:58 +0000 (14:59 +0200)]
QmlDesigner.formeEditor: create paintPlaceHolder
Change-Id: I91d3aa94b4e8ac91eeaed98d19722837e590dfdf
Reviewed-on: http://codereview.qt-project.org/4673
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Mon, 12 Sep 2011 09:48:33 +0000 (11:48 +0200)]
QmlJS: Fix reference lookup cycles.
Since several reference lookups involve Evaluate which may cause
further reference lookups, we need to be able to pass the existing
ReferenceContext to avoid cycles.
Change-Id: I2f1eeaad4d6b6ff094413d51077b03c985f6fab4
Reviewed-on: http://codereview.qt-project.org/4653
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Aurindam Jana [Mon, 12 Sep 2011 10:45:17 +0000 (12:45 +0200)]
WatchHandler: Fix warnings
Change-Id: I877a78b48e7b5c0abb30db6661b9e1986be61b47
Reviewed-on: http://codereview.qt-project.org/4659
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
Thomas Hartmann [Wed, 7 Sep 2011 11:50:47 +0000 (13:50 +0200)]
QmlDesigner.formEditor: improving appearence
Change-Id: Icdc10bb0eca30a4e5d85e5200e1c19b5a846b4e4
Reviewed-on: http://codereview.qt-project.org/4350
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Christian Kamm [Mon, 12 Sep 2011 10:58:59 +0000 (12:58 +0200)]
QmlJS semantic highlighter: Abort when file changes.
Fixes the warning in incrementalApplyExtraAdditionalFormats being
triggered when the document is reduced in size while a highlight is
running.
Change-Id: I60e0c8772d511f52ee433d27cc77ba726030b354
Reviewed-on: http://codereview.qt-project.org/4661
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Stenger [Mon, 12 Sep 2011 09:07:54 +0000 (11:07 +0200)]
Added indentation test for Qml
Change-Id: I15751d93dccba232455e6e85c4ac0c30c74be3af
Reviewed-on: http://codereview.qt-project.org/4650
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Kai Koehne [Mon, 12 Sep 2011 08:06:27 +0000 (10:06 +0200)]
QtQuickApp: Fix qmake dependency to Qt Quick Components for Symbian
The .prf to add the dependency is called qt-components.prf . This broke
building a SmartInstaller package.
Task-number: QTCREATORBUG-6075
Change-Id: I816eac60ab15f40ffc9d3c866f0bf695bfa0983e
Reviewed-on: http://codereview.qt-project.org/4641
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Christian Kamm [Fri, 9 Sep 2011 12:21:31 +0000 (14:21 +0200)]
C++ function signature: Don't accidentally eat specifiers.
You could accidentally delete specifiers like 'static' or 'virtual' with
the 'apply function signature changes' quick fix before.
Change-Id: Ia97a33f663a01063fad4d432551715ebf27a18d5
Reviewed-on: http://codereview.qt-project.org/4538
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Mon, 12 Sep 2011 06:41:53 +0000 (08:41 +0200)]
C++: Fix function return type printing.
We used to print T * foo(), but our style suggests T *foo().
Change-Id: Ie3b0ce6b620785ec98aeb394f7955ce959440619
Reviewed-on: http://codereview.qt-project.org/4634
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Christian Kamm [Fri, 9 Sep 2011 08:55:11 +0000 (10:55 +0200)]
QmlJS: Use mime types to distinguish qml and js files.
This allows adding patterns to the qml mime type in the options dialog.
Previously they were always parsed as js.
Change-Id: Ifa344fb6ab8cbcda02becef991cf6807615a1caa
Reviewed-on: http://codereview.qt-project.org/4515
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Thomas Hartmann [Mon, 12 Sep 2011 08:21:53 +0000 (10:21 +0200)]
QmlDesigner.contextMenu: crash fix
Task-number: QTCREATORBUG-6071
Change-Id: Iae2cc199cd8ec3809bc635084b8a8fa79bb36b08
Reviewed-on: http://codereview.qt-project.org/4643
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Bill King [Mon, 12 Sep 2011 08:29:08 +0000 (10:29 +0200)]
New waitForSignal function
...and real life test case.
Change-Id: Id22f4a7bf444e319651b54e1a3a230040b982e30
Reviewed-on: http://codereview.qt-project.org/4548
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Kai Koehne [Tue, 6 Sep 2011 14:57:11 +0000 (16:57 +0200)]
QtQuickApp: Use QCoreApplication::applicationDirPath also for Harmattan
Latest Harmattan sources deprecate MDeclarativeCache::applicationDirPath
http://meego.gitorious.org/meegotouch/meegotouch-applauncherd/commit/
1c93b10b0aa6fa528d1a49e029a7158b4e2cea8d/diffs
Change-Id: I4342c567265d192a580d572c6bec8d28ab363120
Reviewed-on: http://codereview.qt-project.org/4275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Shane Bradley [Wed, 7 Sep 2011 00:19:21 +0000 (10:19 +1000)]
qttest: Fix issues reported by Krazy
Change-Id: I7bce3cd862b7f680f1b8f42249ae0df4c12e10d9
Reviewed-on: http://codereview.qt-project.org/4299
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Bill King [Thu, 8 Sep 2011 14:45:39 +0000 (16:45 +0200)]
Sort help registrations.
Looks cleaner, also helps cleanup.
Change-Id: If3182f974ca3401cd44fb062d695685e5029aa81
Reviewed-on: http://codereview.qt-project.org/4473
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Leandro Melo [Wed, 7 Sep 2011 12:02:31 +0000 (14:02 +0200)]
Code assist: Fix memory leak in completion
One fix is in the runner, which is part of the completion
engine itself. The other is specific for C++.
Task-number: QTCREATORBUG-5947
Change-Id: Ib8fff1eb5adad1ffb2a11da66c50b545e1457df8
Reviewed-on: http://codereview.qt.nokia.com/4355
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
(cherry picked from commit
e15443e9523df0e40414b1baf7d8182f641f7f2c)