feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,107 Commits 108 Branches 368 Tags
1c52bed5d00c558569d03e65de1c6a31f3ccd3cc
Commit Graph

21107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Kamm
bfc95befa8 QmlJS: Honor typeinfo lines in qmldir files. 
Change-Id: I1ddad1eb031bc4b95671be4a474b5e8e72f6e350
Reviewed-on: http://codereview.qt-project.org/4137
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-08 12:34:32 +02:00
Christian Kamm
10a956a8f7 QmlJS: Find setContextProperty calls in C++ and expose to QML. 
Task-number: QTCREATORBUG-3199

Change-Id: I591490ceafadc0f5a07c63ec063f1bdfa7055f47
Reviewed-on: http://codereview.qt-project.org/4074
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-08 12:34:22 +02:00
Thorbjørn Lindeijer
c2f31f16dc Added support for Microsoft-specific inline keywords 
__inline is equivalent to inline.
__forceinline is used to override the cost/benefit analysis.

Change-Id: Ifc7c94c1798f98c553ffa979a722ede9df11b3f0
Merge-request: 2206
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-on: http://codereview.qt-project.org/4416
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-08 12:02:28 +02:00
Shane Bradley
c10fe02d12 qttest: Rename private classes to match Creator standard. 
Change-Id: I4926d1947216395a18c2e263417d14d08e9487f4
Reviewed-on: http://codereview.qt-project.org/4301
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>
 2011-09-08 11:48:01 +02:00
Daniel Molkentin
c4fb17bef9 Respect 64 bit library path for Qt Components 
Task-Number: QTCREATORBUG-6033
Change-Id: Ib1734956ea88d576354afad686880fa91ea0a38e
Reviewed-on: http://codereview.qt-project.org/4371
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-08 11:26:41 +02:00
Christian Stenger
e137af3a42 Added test for creation of QtQuick application 
Added more QtQuick tests and did some refactorings according to re-appearing code.
Completed the Qt Quick Wizards test from QtCreatorTestingMatrix.

Change-Id: I857d9f3c3809221e2df3e096b3926a8d5d36b828
Reviewed-on: http://codereview.qt-project.org/4238
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
 2011-09-08 10:51:17 +02:00
Christian Kandeler
4bf42e7885 RemoteLinux: Grab used ports information from /proc. 
The target host might not have lsof.

Change-Id: Ic0bbaf933e145b94b4665a0bfad12721984c3cc9
Reviewed-on: http://codereview.qt-project.org/4409
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-08 10:19:56 +02:00
Christian Kamm
107544bd7b C++: Set endOffset of Function symbols even if skipping bodies. 
Fixes insert-definition-from-declaration when the source file was not
yet opened in an editor.

Change-Id: I4263113390ae4fbe9d4641104b5cb43373ddc5a4
Reviewed-on: http://codereview.qt-project.org/4394
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-08 10:05:22 +02:00
Christian Kamm
daf6f5fff0 QmlJS checks: Don't complain about alias properties. 
Change-Id: I6721b42a6ae8cc4de3d85754bf12c95f7366212e
Reviewed-on: http://codereview.qt-project.org/4395
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-09-08 08:56:01 +02:00
Christian Kandeler
9a7ba8fd3f RemoteLinux: Respect qmake scopes for subdirs deployment. 
Task-number: QTCREATORBUG-6017

Change-Id: Ib7e3814c88ad4598e897a0c99103eafb61846eeb
Reviewed-on: http://codereview.qt.nokia.com/4365
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-07 15:50:56 +02:00
Christian Kandeler
5288267be0 RemoteLinux: It's not a fatal error when ports gathering fails. 
Change-Id: If803e1acaaa8164a5177fa5ca227516cc06c577c
Reviewed-on: http://codereview.qt.nokia.com/4364
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-07 15:44:24 +02:00
Robert Loehning
fa3fe48288 Fixed CVSSettings::equals 
Change-Id: I893d740558ddcca1ac20f27088d9388a854be16d
Reviewed-on: http://codereview.qt.nokia.com/4103
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-07 15:38:12 +02:00
Thomas Hartmann
7667e6d779 QmlDesigner: changing the path of plugins 
This patch changes the path of QmlDesigner specific plugins on Linux
and Windows.
The path is changed from lib/qmldesigner to lib/qtcreator/qmldesigner.

The plugins use the same plugindestdir.pri now.

Task-number: QTCREATORBUG-5222
Change-Id: I12e874c8501dc7546f924cec950f29b55a837c88
Reviewed-on: http://codereview.qt.nokia.com/4356
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
 2011-09-07 15:35:27 +02:00
Christian Kandeler
96e003e9fe RemoteLinux: Deploy tarball to /tmp. 
Home directories might be at non-standard locations on embedded Linux
systems.

Task-number: QTCREATORBUG-5916
Change-Id: I9988c9accc91c90e9b950b74460d48aacd18da28
Reviewed-on: http://codereview.qt.nokia.com/4362
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-07 15:09:44 +02:00
Christian Kandeler
9a18401495 RemoteLinux: Remove unused class member. 
Change-Id: Ifdd99c320253774f1c3938188ef1bc103c1638b4
Reviewed-on: http://codereview.qt.nokia.com/4361
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-07 15:09:15 +02:00
Leandro Melo
e15443e952 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>
 2011-09-07 14:42:16 +02:00
Christian Kandeler
1edf045a0e ProjectExplorer: Make RunConfiguration::fromMap() public. 
Callers might want to use it polymorphically, e.g. in the restore()
method of a factory that can create more than run configuration.

Change-Id: I773f7b5d75fb6f9ad007cdafc0cf0b56e5f8da8b
Reviewed-on: http://codereview.qt.nokia.com/4266
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-09-07 13:46:58 +02:00
Kai Koehne
f4e59af18d List new changes-2.3.1 file in qtcreator.pro 
Change-Id: I611935b4c993d70a566fe1cbc6bcf5eb362339c2
Reviewed-on: http://codereview.qt.nokia.com/4349
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-07 13:31:13 +02:00
Christian Kandeler
23c3fb7c5f Harmattan: Fix initial packaging icon. 
The code had not been updated when the application icon file name
changed in the wizard.

Change-Id: I3f489ca09ac1bda4f10166235692a43ca23e638a
Reviewed-on: http://codereview.qt.nokia.com/4305
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-07 12:45:30 +02:00
Christian Kandeler
51d0e38951 Harmattan: Fix package version updates. 
Obviously, we can't just globally replace all version numbers. Instead,
we now duplicate the latest entry and replace version number, date and
comments. Also implemented is a simple check guarding against
downgrading, which just checks whether the "new" version number already
appears in the changlog file.

Task-number: https://bugreports.qt.nokia.com/browse/QTCREATORBUG-5797
Change-Id: I17512169972415f60d1a9715ac8b98d185da8694
Reviewed-on: http://codereview.qt.nokia.com/4209
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-07 12:28:17 +02:00
Daniel Teske
c083bded23 Export Qt4PriFileNode 
Change-Id: I4e6dd89a8ddd95aa21ebf5555c05349f541bd83e
Reviewed-on: http://codereview.qt.nokia.com/4335
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-07 12:10:03 +02:00
Daniel Teske
6b1bc495a0 Add Qt4PriFileNode::subProjectNodesExact which uses the exact parse 
Change-Id: Ic6b8dedbc31830295e3dccea82c5f6514840dc57
Reviewed-on: http://codereview.qt.nokia.com/4282
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-07 12:09:49 +02:00
Kai Koehne
38fce2ccb8 Creating changes-2.3.1 file 
Change-Id: I7c80df7a17c0ed99e4d66861980b0b0f6d2d4606
Reviewed-on: http://codereview.qt.nokia.com/4337
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-07 12:06:45 +02:00
Tobias Hunger
ba2ffd4553 Remove unnecessary virtual keywords 
Change-Id: I8f75bad07959a8d80ddf1c9245b89c1cc977ce61
Reviewed-on: http://codereview.qt.nokia.com/4280
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-07 10:55:37 +02:00
Tobias Hunger
826607a190 Abi: Add isNull() method 
Change-Id: If8d6e5ace13857e4435b09e47d5d40dd2befdacf
Reviewed-on: http://codereview.qt.nokia.com/4279
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-09-07 10:55:27 +02:00
Christian Kamm
b53570d48d QmlJS parser: Fix else token in IfStatement. 
Change-Id: Id994a9c5777021e3dc5027776df42234441440d8
Reviewed-on: http://codereview.qt.nokia.com/4319
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-09-07 09:32:32 +02:00
Christian Kamm
c074b18f8d C++: Improve Literal::hashCode. 
This can have a dramatic impact on performance when a file contains lots
of unique literals.

Change-Id: I5309b28f704d7f53e164dc8084ae08354c09354b
Reviewed-on: http://codereview.qt.nokia.com/4312
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-09-07 09:32:24 +02:00
Christian Kandeler
dcf835a587 RemoteLinux: Make incremental deployment configurable... 
...for the direct upload step.

Change-Id: I369963556f0c72b692b802b30a0e43c03b8b2397
Reviewed-on: http://codereview.qt.nokia.com/4315
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-07 09:13:59 +02:00
Eike Ziller
b0b35a356d Refactor the search result widget to its own class. 
To be used for switching between multiple search result lists.

Change-Id: I4cf62f7e5adf71bac7d4fdfed05d74cea4f3ca44
Rubber-stamped-by: Daniel Teske
Reviewed-on: http://codereview.qt.nokia.com/4255
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-07 08:49:30 +02:00
Christian Kamm
e850586b77 QmlJS checks: Warn about inappropriate use of constructor functions. 
Change-Id: Iaedaaa88915f2010bfdd0d2b5ca95f01f8663ed7
Reviewed-on: http://codereview.qt.nokia.com/4254
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-07 07:27:57 +02:00
Christian Kamm
4e60db9065 QmlJS: Cleanup in Check. 
Evaluate supports ExpressionStatements now.

Change-Id: I74c440fe0abf27c3d3b41b7d28a69fdd9359fb2e
Reviewed-on: http://codereview.qt.nokia.com/4080
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-07 07:27:45 +02:00
Marco Bubke
31311a4db6 QmlDesigner.NodeInstances: Show stripes for items without content 
Change-Id: I6c737616d485445d77efd8b6d73b2d8259e5120b
Reviewed-on: http://codereview.qt.nokia.com/4288
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-06 18:08:06 +02:00
Marco Bubke
9837dadbcb QmlDesigner.NodeInstances: Refactor isManipulatable to isChangeable 
Change-Id: Icfc508e1549f4cfbcdda09b4611b2d66b4e2de1d
Reviewed-on: http://codereview.qt.nokia.com/4287
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-06 18:07:55 +02:00
Marco Bubke
387eebf4e9 QmlDesigner.NodeInstances: Render only items with content 
Change-Id: I9f17f369816763b2ac983d557d6bcaa723a28139
Reviewed-on: http://codereview.qt.nokia.com/4286
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-06 18:07:37 +02:00
Leandro Melo
5d93161248 C++: Add __try, __except, and __finally to configuration 
This is not really a direct mapping to the Microsoft specifc
ones, but I guess defining such macros is an acceptable solution.

Change-Id: I17a9414364ef664f2e8afa7ececc6a87f663049e
Reviewed-on: http://codereview.qt.nokia.com/4277
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
 2011-09-06 17:30:58 +02:00
Christian Stenger
b144de97ea Corrected lookup for qmlviewer on Windows 
Change-Id: I4ebb87bca34aba07ef5fd408cf5481d8cb10ecf6
Reviewed-on: http://codereview.qt.nokia.com/4264
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
 2011-09-06 17:09:07 +02:00
Eike Ziller
0594887dea Move and cleanup search specific API to SearchResult class 
Change-Id: I7e64701e8833ad38b9ac01d316bd00302602a390
Rubber-stamped-by: Daniel Teske
Reviewed-on: http://codereview.qt.nokia.com/4179
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-06 17:05:22 +02:00
Christian Kandeler
3fb2e7246e RemoteLinux: Give default value to constructor argument. 
Change-Id: I39d5994d3a8ccad29f462f04eeff2ce9b6ef9566
Reviewed-on: http://codereview.qt.nokia.com/4265
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-06 16:17:08 +02:00
Leandro Melo
d91c218d54 C++: More flexibility for string representation of macros 
It's now possible to get the macro definition with the actual
line breaks used on the code. This is particularly useful for
tooltips in order for them to look nice.

The preprocessor is changed so the macro also stores the breaks
positions. This doesn't seem to have any impact on performance.
In my machine, for example, the total time for parsing Creator's
source code is approx. 18100ms with or without the patch.

Change-Id: Ic7487236315c3567d26496315accdb2adfea894a
Reviewed-on: http://codereview.qt.nokia.com/4253
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-09-06 14:21:04 +02:00
Leandro Melo
b237464045 C++: Normalize line ending for preprocessing 
There is logic in the preprocessor that assumes a normalized line
ending. Other patches have already fixed the issue in other parts.

Change-Id: Iac262da361b6528cc9466a6c87e83da95af9ea04
Reviewed-on: http://codereview.qt.nokia.com/4252
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-09-06 13:58:03 +02:00
Kai Koehne
a2e9fadb61 QmlProfilerTool: Fix hang on exit 
the reader thread has to terminate on its own, terminate
is not reliable.

Change-Id: I4222bc8f0c585c190cd90efbaade0b03ca698ec7
Reviewed-on: http://codereview.qt.nokia.com/4194
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-09-06 13:45:36 +02:00
Kai Koehne
fbddfa5c91 QmlProfilerTool: Fix help text 
Make sure it fits 80 columns.

Change-Id: I52eea0e79be33ae7b546fbca6b7e07e1d78d2a94
Reviewed-on: http://codereview.qt.nokia.com/4191
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
 2011-09-06 13:45:31 +02:00
Thomas Hartmann
5a453c9995 Fix property type mismatch in Qt Quick Designer 
* GridView.keyNavigationWraps
* ListView.keyNavigationWraps

Task-number: QTCREATORBUG-5776

Change-Id: I6d18650a6be83bdeb1bb6f38749d0bae79e52e24
Merge-request: 365
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/4249
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
 2011-09-06 13:11:50 +02:00
Thomas Hartmann
2a61c63945 QmlDesigener.propertyEditor: support for QtQuick 2.0 gradients 
Change-Id: I00c58120080f84a30431c34c5c71866f63aca0e4
Reviewed-on: http://codereview.qt.nokia.com/4212
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-06 13:08:57 +02:00
Thomas Hartmann
850c94c388 QmlDesigner.modelMerger: fix for imports 
Change-Id: Icaae847dab5758655389771cdf662a18e8a8211e
Reviewed-on: http://codereview.qt.nokia.com/4206
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-09-06 11:33:03 +02:00
Erik Verbruggen
bb41c375b0 C++: removed assert that could crash creator. Gracefully exit instead. 
Change-Id: Iab79b2548195feb83b3f408f0eb612878454bd47
Reviewed-on: http://codereview.qt.nokia.com/4246
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-09-06 10:51:13 +02:00
Christian Kandeler
1a4d13df5f TextEditor: Remove byte order mark. 
Some compilers have problems with such control characters.

Change-Id: I137913f8c7f8bd83367c3e5dbad4018045eff28f
Reviewed-on: http://codereview.qt.nokia.com/4240
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
 2011-09-06 10:07:20 +02:00
Christian Kamm
aad5ab8542 QmlJS: Check property declaration types. 
Change-Id: I2cc1236552e00e99a846b0d4b724135724f175fc
Task-number: QTCREATORBUG-3666
Reviewed-on: http://codereview.qt.nokia.com/4241
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-06 10:07:16 +02:00
axasia
005e283b05 Update japanese translation for 2.3. 
Merge-request: 376
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: I611a10a7d3c5bd8cdc15d5924e182531befcff1f
 2011-09-05 18:57:53 +02:00
Beaver Xu
3bf7a7bcfb chinese translation fixes 
Merge-request: 375
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

Change-Id: Ibbf38354f2d687e9991d0bc522574df4de5bd387
 2011-09-05 18:48:02 +02:00