feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
20,915 Commits 108 Branches 368 Tags
dbfae9fb28e563f20b683d58310929d53f11c99d
Commit Graph

20915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurindam Jana
dbfae9fb28 QmlDebugger: Attach to QML Port: Fix errors 
Connect to user defined host and port. Increased maximum connection tries.

Change-Id: Ie72a9fb36e5178b64311753bd8a3fe20e6f62c3b
Reviewed-on: http://codereview.qt-project.org/4918
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-19 13:56:08 +02:00
Christian Kamm
cf2e3f225e QmlJS: Fix highlighting of property types. 
Task-number: QTCREATORBUG-6127
Change-Id: Iae5cd6256b2f1e792c3c91eb5915e3f082753e6e
Reviewed-on: http://codereview.qt-project.org/5136
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-19 13:52:52 +02:00
Christian Kamm
4fdeeb3039 QmlJS: Fix enum completion with 'as' imports. 
Change-Id: Ifc229c23c14a6395c9d3e5f7ec76b9b04678787d
Reviewed-on: http://codereview.qt-project.org/5134
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-19 13:52:44 +02:00
Christian Kamm
3e090166e3 QmlDesigner: Add null checks. 
Change-Id: I8f12a5391ec20829422d8c6eab3d4d191527e70e
Reviewed-on: http://codereview.qt-project.org/5130
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-19 13:52:36 +02:00
Christian Kamm
6c925cf0fc QmlJS: Rework exported C++ type registry. 
The problem was that if you exported
A 1.0, A 1.1 and B 1.0 where A is the prototype of B
the code model had not enough information to know that, depending
on the import, B 1.0's prototype should be A 1.1 or A 1.0.

To solve this problem QmlObjectValues now store the import's version
as well as the local component version. In the example above B 1.0
would have import version 1.1 if the 1.1 module was imported and thus
be able to choose the right prototype.

Change-Id: I7ef33f12ca5a528c62b2a8240f4b5720b0ebd4c3
Reviewed-on: http://codereview.qt-project.org/5129
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-19 13:52:26 +02:00
Daniel Molkentin
793031c7ba Make Qt Installer Framework Update Notifier part of QtCreator. 
Always compile but never run it unless UPDATEINFO_DISABLE
is being set to 'false' via qmake or environment.

Change-Id: Ie53fb2ea99bfebac1b6f416939554f25a5e481a7
Reviewed-on: http://codereview.qt-project.org/4483
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
 2011-09-19 13:51:53 +02:00
Christian Kandeler
ac2bc6f39a RemoteLinux: Take adavantage of new proParsingDone() signal. 
Change-Id: I81aada97401a1f100f5e6c8376c297c8f2f86688
Reviewed-on: http://codereview.qt-project.org/5141
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-19 13:49:20 +02:00
Daniel Teske
57fa668bcd Add Qt4Project::proParsingDone(), which is emitted after parsing 
Change-Id: Id2eb1d2494438bac17f3104ee8a9ed56cc9b1db9
Task-Nr: QTCREATORBUG-6056
Reviewed-on: http://codereview.qt-project.org/4665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-19 13:45:06 +02:00
hjk
4759d8cef4 debugger: fix a wrong sanity check in the dumpers 
Change-Id: Ie2dce425cf1204f22bb752bd400bc98211b45a63
Reviewed-on: http://codereview.qt-project.org/5126
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:39:24 +02:00
hjk
cda5af893b debugger: show at least "elide" markers for thread ids 
Task-number: QTCREATORBUG-6110
Change-Id: I439fc6463c42fce134646c620ac19a5c533217fe
Reviewed-on: http://codereview.qt-project.org/5123
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:24:24 +02:00
hjk
5295e05310 minor style 
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7
Reviewed-on: http://codereview.qt-project.org/5122
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 11:24:14 +02:00
hjk
85bf185e2f qt4project: disable debug output 
Change-Id: I33ae40566677d9b80b27facddab25c1ee7905761
Reviewed-on: http://codereview.qt-project.org/5118
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 09:16:33 +02:00
Christian Kamm
f8462cca65 QmlJS: Change from QMap to QHash for QString keys. 
Tests indicate that lookup in QHash<QString, ...> is more performant
even for short strings.

Change-Id: I8e5a73d0f1a72e202522f397b16901887f9c3591
Reviewed-on: http://codereview.qt-project.org/5070
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-19 09:09:28 +02:00
Orgad Shaneh
3503731abd Dumper: QHash: corrected variable usage 
Merge-request: 389
Reviewed-by: hjk <qtc-committer@nokia.com>

Change-Id: I331cef5cff4d8a21e1104efffe5896f944573d7d
Reviewed-on: http://codereview.qt-project.org/5117
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 08:56:55 +02:00
hjk
58cb19e55e all: less QScopedPointer 
Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2
Reviewed-on: http://codereview.qt-project.org/5116
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 08:56:44 +02:00
hjk
dbe1653775 more style 
Change-Id: Iecd6819a5376beced5413f134d3026fb889a13b1
Reviewed-on: http://codereview.qt-project.org/5115
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-19 08:56:31 +02:00
Christian Kamm
b3bb5d700e QmlJS checks: Don't crash if try has no catch or finally. 
Change-Id: If7001963bc11f2fa01f058c903ee014f6acb0c04
Reviewed-on: http://codereview.qt-project.org/5102
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-16 15:35:07 +02:00
Daniel Teske
aebcc3c75b Fix proFileUpdated signal 
Make sure it is always emitted if the parseInProgress state changes

Change-Id: I0e8dc6df5c68f14bd51885c078e909be10af8efa
Task-Nr: QTCREATORBUG-6057
Reviewed-on: http://codereview.qt-project.org/4657
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-16 14:38:07 +02:00
Christian Kamm
649b8057f9 QmlProject: Update code model even without valid qmldump. 
Change-Id: I6c27fe4ca0201cbbe929821d4408d61a068e8982
Reviewed-on: http://codereview.qt-project.org/4968
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-16 13:38:41 +02:00
Christian Kamm
0825e422e3 QmlProject: Add qmlproject files to x-qml mimetype. 
Change-Id: Ia8ff967badea1ca499da03651b3e7e0c2f78fd7b
Reviewed-on: http://codereview.qt-project.org/4951
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-16 13:38:33 +02:00
Tobias Hunger
4ed54b8e87 Fix thinko 
Change-Id: I835b42cc1d16df43200579cc1bf85422784bf79d
Reviewed-on: http://codereview.qt-project.org/5085
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-16 13:37:41 +02:00
Leena Miettinen
83307a7707 Doc: remove unnecessary qdoc tag 
Change-Id: Ib0d8a7bf7ad741f12c179b6215df44ed04f82534
Reviewed-on: http://codereview.qt-project.org/5079
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-09-16 12:53:22 +02:00
Leena Miettinen
e84f100687 Doc: fix typo 
Task-number: QTCREATORBUG-6123
Change-Id: Ide0460317561c116fdaf12f400cc8b12f5c40ca0
Reviewed-on: http://codereview.qt-project.org/5078
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2011-09-16 12:49:55 +02:00
Eike Ziller
d877689f4f Reduce vertical minimum size of perforce settings. 
Change-Id: I1a6c6b2fe6fcafda75e30e96995baa5194461846
Reviewed-on: http://codereview.qt-project.org/5022
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-16 11:52:52 +02:00
Tobias Hunger
e7c118c709 ABI: Make "linux-generic" ABIs compatible with "linux-*" 
This is for the benefit of people using e.g. meego tool chains to
build their own Qt versions and work with them in the desktop
target.

All the specialized targets filter the tool chains again, so
this should be ok to do.

Task-number: QTCREATORBUG-5960
Change-Id: If872d8a6ba75985f23f36646bb89e1651ce82f80
Reviewed-on: http://codereview.qt-project.org/4521
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-16 11:48:30 +02:00
Aurindam Jana
f05683ac7e JSDebugger: Enable break on events. 
The user can request Javascript break on event. The user can provide
this info in the Breakpoints Window and provide the slot which will
be called when the event occurs. For example: specify "onTriggered" if
you need to break on Timer triggered event.

Change-Id: If936d7402f5978a182132fdcca75515588364e16
Reviewed-on: http://codereview.qt-project.org/4758
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-16 11:42:54 +02:00
hjk
1285a63852 d-ptr style 
Change-Id: I9bae06c72d71d77b4a43f87217b7c3f8077a1fd1
Reviewed-on: http://codereview.qt-project.org/5075
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-16 11:35:08 +02:00
hjk
aea628a973 whitespace 
Change-Id: I67b156ab6f44ccdfe199b4928f6f62129b05b0b7
Reviewed-on: http://codereview.qt-project.org/5074
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-16 11:34:54 +02:00
hjk
c6a8b39a03 debugger: hard-code some qt5 related paths 
This is not a final solution.

Change-Id: I19e7a99e1b056704864d27855197678a0d3fd10b
Reviewed-on: http://codereview.qt-project.org/5073
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-16 11:06:20 +02:00
hjk
54f7489ea1 debugger: add manual test for QVariantMap 
Change-Id: I32341ddc529cc20f5c7d1f907d88a05f5e062cb0
Reviewed-on: http://codereview.qt-project.org/5072
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-16 11:06:03 +02:00
Eike Ziller
d3cce3a027 Merge remote-tracking branch 'origin/2.3' 2011-09-16 10:44:32 +02:00
Eike Ziller
f396395056 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>
 2011-09-16 10:34:56 +02:00
Christian Kamm
4dc13ab09f 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>
 2011-09-16 10:20:45 +02:00
Christian Kandeler
8ba4003c13 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>
 2011-09-16 08:47:24 +02:00
Leena Miettinen
65152538cc 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>
 2011-09-15 17:26:55 +02:00
Leena Miettinen
134a698896 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>
 2011-09-15 17:26:29 +02:00
Aurindam Jana
9d730da17a 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>
 2011-09-15 16:12:56 +02:00
Daniel Molkentin
fdee7d2876 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>
 2011-09-15 15:37:19 +02:00
hjk
18f6c5e457 debugger: mark optimized out values as such 
Change-Id: I57fedc5a2525e7e520e9ba8586e5d5f3eb4da091
Reviewed-on: http://codereview.qt-project.org/5005
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-15 15:05:55 +02:00
Thomas Hartmann
58bef05980 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
 2011-09-15 14:24:33 +02:00
Tobias Hunger
caa8bd454e 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>
 2011-09-15 14:19:01 +02:00
hjk
28535f7571 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>
 2011-09-15 14:11:09 +02:00
Christian Kamm
4083880073 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>
 2011-09-15 13:49:13 +02:00
Kai Koehne
6b1f96bf7b 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>
 2011-09-15 13:35:34 +02:00
hjk
26f163570b debugger: work on manual test 
Change-Id: I6a803c770e8adf27fb7f6227d0d71c20ed0dffcf
Reviewed-on: http://codereview.qt-project.org/4985
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-15 13:34:23 +02:00
hjk
922058cdf8 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>
 2011-09-15 13:33:33 +02:00
Christian Kamm
940fb1c4ab Qt4Project: Update code models if a folder watch changes the file list. 
Fixes: c861af529e

Change-Id: I7ed8afd52ab694d053788fac7f3e994898f2dd84
Reviewed-on: http://codereview.qt-project.org/4969
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-15 12:30:44 +02:00
hjk
cdbd390475 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>
 2011-09-15 12:21:58 +02:00
Christian Kamm
c861af529e 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>
 2011-09-15 12:20:50 +02:00
Orgad Shaneh
ee5a52da61 Process Stub: Release file handle 
Task-number: QTCREATORBUG-5382
Merge-request: 388
Reviewed-by: ossi

Change-Id: Ie80fdbe2eadb55d3b5684ebc7a79162317d1a36b
 2011-09-15 12:19:12 +02:00