Commit Graph

21107 Commits

Author SHA1 Message Date
Orgad Shaneh
5734697435 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>
2011-09-13 12:51:15 +02:00
Christian Kamm
fc7dae4096 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>
2011-09-13 11:50:06 +02:00
Marco Bubke
72056e3570 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>
2011-09-13 09:52:40 +02:00
hjk
f70233fe48 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>
2011-09-13 09:44:01 +02:00
Robert Loehning
bc585fd4ec 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>
2011-09-12 17:21:57 +02:00
Robert Loehning
2b480103e3 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>
2011-09-12 15:11:33 +02:00
Thomas Hartmann
1cfc97ae02 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>
2011-09-12 15:03:01 +02:00
Christian Kamm
7b2110de7e 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>
2011-09-12 14:47:35 +02:00
Aurindam Jana
ef47a40570 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>
2011-09-12 14:31:28 +02:00
Thomas Hartmann
ef4a86b8b2 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>
2011-09-12 13:49:15 +02:00
Christian Kamm
5b88093b5d 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>
2011-09-12 13:30:09 +02:00
Christian Stenger
c36e017d40 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>
2011-09-12 12:44:59 +02:00
Kai Koehne
cdbb6f2cb9 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>
2011-09-12 11:24:19 +02:00
Christian Kamm
5a0a44bf92 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>
2011-09-12 11:23:52 +02:00
Christian Kamm
151475a0fe 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>
2011-09-12 11:16:39 +02:00
Christian Kamm
903c6b60cd 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>
2011-09-12 10:45:53 +02:00
Thomas Hartmann
421a1cf93c 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>
2011-09-12 10:35:46 +02:00
Bill King
509eb894dd 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>
2011-09-12 10:35:26 +02:00
Kai Koehne
c00ee6701b QtQuickApp: Use QCoreApplication::applicationDirPath also for Harmattan
Latest Harmattan sources deprecate MDeclarativeCache::applicationDirPath

1c93b10b0a/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>
2011-09-12 10:22:06 +02:00
Shane Bradley
c1e32ad604 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>
2011-09-12 09:49:23 +02:00
Bill King
942973faf4 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>
2011-09-12 08:51:15 +02:00
Leandro Melo
ad22dc767c 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 e15443e952)
2011-09-12 08:40:05 +02:00
Leandro Melo
c5694cc5e1 C++: Fix duplicate items in C++ completion for Qt methods
In the old code completion engine items were created on the stack
and passed around by value. With the refactoring of the code assist
API they became heap objects manipulated through pointers. This
patch fixes one reminiscence not caught during the refactoring
in which the same actual pointer was being used more than once to
be appended on the list.

Change-Id: I2009fb0b6aa18df57aa5ca9bde0591536ca2cd74
Reviewed-on: http://codereview.qt-project.org/4444
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
(cherry picked from commit a1fa169219)
2011-09-12 08:39:49 +02:00
Eike Ziller
55606d5db6 Few more things to changes file.
Change-Id: I96ec220e7df1cb5a683e0319641c30e43c1c573d
2011-09-12 08:35:19 +02:00
Christian Kandeler
aa5f2928a4 RemoteLinux: Change output at the end of a deploy step.
"Deployment finished" is potentially misleading, as other steps
might follow.

Change-Id: I457b2c2427c65146b48e13bf9323ac11feee18db
Reviewed-on: http://codereview.qt-project.org/4561
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-09 17:09:47 +02:00
Christian Kandeler
3e1ad6f5fe RemoteLinux: Change default deployment method.
Do direct upload instead of creating and extracting a tarball.

Change-Id: Ic84f3a833a7f42e392e37bf4e9b2f9522af5f5ca
Reviewed-on: http://codereview.qt-project.org/4560
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-09 17:07:12 +02:00
Eike Ziller
64440a7964 Remove unnecessary 'explicit's.
Change-Id: Id0386635b1c7daadf2501361a2c78019b9dfd4ab
Reviewed-on: http://codereview.qt-project.org/4553
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-09 16:13:35 +02:00
Bill King
690ed9f7ec More wait-for-project-refresh
Change-Id: Ic08c7e66edbcf300d6643ea0139cf9eea1720e31
Reviewed-on: http://codereview.qt-project.org/4519
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-09 14:51:51 +02:00
Christian Kandeler
248654873a RemoteLinux: Make GenericDirectUploadStep extensible.
Change-Id: I2f201145dbfcd152a7d5624554d66dc17a91352c
Reviewed-on: http://codereview.qt-project.org/4539
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-09 14:27:22 +02:00
Bill King
81689c9f56 Speed up this testcase
While qt is large, it also takes a fair amount of time to process.
This should still be a sufficient testcase for basic project opening.

Change-Id: I319d009d22ad1607926d2cd751953a6268266f35
Reviewed-on: http://codereview.qt-project.org/4523
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-09 14:20:26 +02:00
Bill King
29838517ce Wait for project refresh before building.
Change-Id: Ia5bbeec726168ecd0264ff351dd0eab9b9af31d2
Reviewed-on: http://codereview.qt-project.org/4512
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-09-09 11:11:14 +02:00
Tobias Hunger
5eb4c8a301 Build fix
Change-Id: I2cef68b757d6f0affd21151a7f59029dce814c95
Reviewed-on: http://codereview.qt-project.org/4485
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-09-08 19:49:17 +02:00
Tobias Hunger
aaf260c04b ABI: Improve tool chain selection for Qt projects
* Set a null-ABI for toolchains where detection of ABI failed: This
  allows the user to select any tool chain.

* Warn if ABI detection fails by showing a message in the Qt version
  setup dialog

* Do not override the mkspec if the Qt version has a null ABI only:
  We (have to) trust the user to know what he is doing in that case.

* GCC: Add version information to GCC tool chain and use it to select
  the mkspec on Mac.

* GCC: Do not override mkspec if we do a cross-compile
  (and actually detect that).

* GCC: Leave out -32 or -64 from mkspec if the compiler binaries ABI
  matches the target ABI.

* Linux-generic is compatible with all other linuxes (both ways)
  The targets themselves do additional filtering and will remove
  anything that does not work for them anyway.

Task-number: QTCREATORBUG-5756
Task-number: QTCREATORBUG-5960
Change-Id: Ib3c0ac91f3aa8e2a823e3e9891a02bdccb97af14
Reviewed-on: http://codereview.qt-project.org/4281
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-09-08 18:32:50 +02:00
Daniel Molkentin
edd786d0c1 Fix glitch in c4fb17bef9.
Change-Id: I239af4d7f03553760bf1fd1de0cedd552246565c
Reviewed-on: http://codereview.qt-project.org/4476
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
2011-09-08 18:27:52 +02:00
hjk
bfd9fcbb3c all: some m_d -> d style
Change-Id: Iac1f12980bf47666007817cfb2c64a6d1e9b780e
Reviewed-on: http://codereview.qt-project.org/4477
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-08 17:42:14 +02:00
hjk
66ab323eb3 use Core::Id for IEditorFactory::id
Change-Id: Iefd67a0461d9016b8ba0f3371df7ec6d42e188c5
Reviewed-on: http://codereview.qt-project.org/4321
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-08 17:40:53 +02:00
hjk
b51524c5c1 debugger: take care of unknown instructions in arm disassembler output
Change-Id: Ibeb8992856e8c5031e21925316c3fb0f9d7764e1
Reviewed-on: http://codereview.qt-project.org/4479
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-08 17:40:19 +02:00
hjk
a12ba22ed3 debugger: robustness when stepping through inaccessible memory
Change-Id: I9cafda99986b653872e57f8223a0fe4621fd5136
Reviewed-on: http://codereview.qt-project.org/4478
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-08 17:40:06 +02:00
Pawel Polanski
135b24b910 Symbian: QML Viewre version added to info button
Change-Id: I413232e486053950230fe131dc156990ac1d96cf
Reviewed-on: http://codereview.qt-project.org/4470
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
2011-09-08 16:23:48 +02:00
Pawel Polanski
436c5a768b CODA: Fixed crash when redeploying
Change-Id: Id154468d6ee4db4eb045fde8a0e858ad5b17428f
Reviewed-on: http://codereview.qt-project.org/4469
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
2011-09-08 16:20:52 +02:00
Christian Kamm
f9effd16b3 C++ function signature: Fix problem with multiline declarations.
QTextCursor::selectedText() has null chars where the tokenizer expects
newlines.

Change-Id: I15ae87ef8525c89812a61b80abda91d36bf56576
Reviewed-on: http://codereview.qt-project.org/4450
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-09-08 14:56:42 +02:00
Leandro Melo
a1fa169219 C++: Fix duplicate items in C++ completion for Qt methods
In the old code completion engine items were created on the stack
and passed around by value. With the refactoring of the code assist
API they became heap objects manipulated through pointers. This
patch fixes one reminiscence not caught during the refactoring
in which the same actual pointer was being used more than once to
be appended on the list.

Change-Id: I2009fb0b6aa18df57aa5ca9bde0591536ca2cd74
Reviewed-on: http://codereview.qt-project.org/4444
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-09-08 14:53:54 +02:00
Benito van der Zander
d6e46f7a84 add always defined macro Q_CREATOR_RUN to cpp parser
Merge-request: 336
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>

Change-Id: Iefd0c60bb3e78047e28dcff33cc62c15ed11f711
Reviewed-on: http://codereview.qt-project.org/4292
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2011-09-08 14:09:48 +02:00
Christian Kamm
ca35046827 QmlJS checks: Improve warning about accidental empty blocks.
Change-Id: I2bddd65aef9092bf87f5a441e065ebca0e772174
Reviewed-on: http://codereview.qt-project.org/4331
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-09-08 14:06:28 +02:00
Christian Kamm
5b8d7b465c QmlJS checks: Fix collection of use-before-declaration warnings.
Previously they would not be collected if the var had a
duplicate-declaration warning.

Change-Id: I82244e911fcdfc3d11cc391288da263ee288a3ca
Reviewed-on: http://codereview.qt-project.org/4330
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-09-08 14:06:16 +02:00
Christian Kamm
70aac78582 C++: Always set source location of function symbols.
Change-Id: I83bcea6fcdbf113d541a962ac461aef1765d99fd
Reviewed-on: http://codereview.qt-project.org/4433
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2011-09-08 14:04:50 +02:00
Christian Kamm
62a71b75a0 QmlJS indenter: Fix indentation for property initializers.
property int foo: {

used to start an object literal but is a block statement now.

Change-Id: I9ffbce4927b444314f1a43aba65ca3d9d234e47c
Reviewed-on: http://codereview.qt-project.org/4339
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2011-09-08 13:55:08 +02:00
Aurindam Jana
84364b7884 WatchHandler: Move generationCounter to individual WatchModels
Change-Id: I39cdd48ed02cbcf6702076245c765cb6c8926c1b
Reviewed-on: http://codereview.qt-project.org/4429
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-08 13:42:18 +02:00
Pawel Polanski
eb206dfed7 CODA: Debug output added to CODA 4.0.23
Change-Id: Idd2ea3d11a5ee193205c642cc6176ec70c6ef41a
Reviewed-on: http://codereview.qt-project.org/4418
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
2011-09-08 12:54:07 +02:00
Christian Kandeler
2db7393234 RemoteLinux: Don't assume a POSIX-compliant ps command.
Presumably, lots of embedded systems don't have one.

Task-number: QTCREATORBUG-5918
Change-Id: Idfbd7fe2d27ed992b3f3dbba240943d0fe41dc5b
Reviewed-on: http://codereview.qt-project.org/4432
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-08 12:49:33 +02:00