feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
89,589 Commits 108 Branches 368 Tags
afea900b966d202435292cb15101ee71b9299f19
Commit Graph

1464 Commits

Author SHA1 Message Date
Christian Kamm
de6ea6c3b9 QmlJS: Handle inner ids in 'Wrap in Loader' quick fix. 
Change-Id: I7385f49928db78abd2deb7783ca0a38288ae7446
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-11-04 14:13:17 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
hjk
29279ab8c7 more style fixes of string literal access 
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-02 18:20:19 +01:00
Eike Ziller
912cd548c0 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7
 2011-11-01 18:16:38 +01:00
Eike Ziller
c4f6ad856d Remove unnecessary code. 
Change-Id: I07a382696c57f5451645e854e55aa30e9e81326c
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-31 08:37:35 +01:00
Christian Kamm
c8fc9b33ae QmlJS: Clean up idOfObject() and folding text code. 
Change-Id: Id3e9d24689c67ce0e12b12b82636177a0344ede1
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-28 15:49:38 +02:00
Eike Ziller
81cce8902e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljscheck.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: Id2dcebf95b94dc46c1d85908ba1d1378aaf362ac
 2011-10-28 10:17:44 +02:00
Christian Kamm
9902ed2bc9 QmlJS tooltips: Avoid unhelpful tooltips. 
Saying 'unknown' or 'undefined' isn't very useful.

Change-Id: I130013a8f025ebc5eb984358f269fdf8a23aae92
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-10-25 12:14:49 +02:00
Christian Kamm
7aa075c71b QmlJS: Remove soft assert that could trigger for multi-line strings. 
Change-Id: I54f451677d78d6aefe0f567888b9bbcec426fc72
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-24 13:49:48 +02:00
Nicolas Arnaud-Cormos
635ca2a51a QmlEditor: show the id name when folding a block. 
If the id of an element exists, it will be displayed instead of the normal "..."

Change-Id: I4e6633743b0e2ae014b7fbad3c752ef318c73659
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-22 21:11:32 +02:00
Christian Kamm
0ed824762c QmlJS checks: Suppression of static analysis messages. 
* Use '// @disable M123' to suppress
* Add quick fix to add these comments

Change-Id: I499f5a6004148afbb346218c6fb01c9ca77b9f73
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-10-19 15:09:35 +02:00
Christian Kamm
cf156cd2ea QmlJS: Add quick fix to wrap element in Loader. 
Change-Id: Ie8b1624abfd9faa8c6153ad99e48964d597d543c
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-10-19 14:21:47 +02:00
Christian Kamm
4a487b1add QmlJS indenter: Move reusable code to qmljs lib. 
Change-Id: I5ab50b586109a9736cda48245807571ce10dfb5b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-19 08:33:21 +02:00
Eike Ziller
8eb8368139 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: Id032187023bb42f259a87545ceeb3c965dd01a32
 2011-10-17 14:22:32 +02:00
Christian Kamm
eabd58139d QmlJS: Fix build with Qt 4.7. 
Change-Id: Ibe239db039bd64892a55805847de61dedad76640
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-10-14 12:40:16 +02:00
Christian Kamm
a15e3a3e90 QmlJS: Fix QUrl completion with Qt 4.8. 
QUrl no longer treats scheme-less urls as local files.

Change-Id: Ie219985d653a692937ff9a5ebbafc455cd3dca13
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-13 11:16:33 +02:00
Christian Kamm
1b036eb9e7 QmlJS: Clean up completion logic. 
To avoid '/' triggering a global completion and improve code
readability.

Change-Id: I0cdb8efb159199156a766982db8979ee987f414b
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-12 14:07:57 +02:00
Christian Kamm
c436e63ba7 QmlJS: Another compile fix for wrong rebase. 
Change-Id: Ic46a72e3f9ad6689d260264c9f74dc4e17d01ee5
Reviewed-on: http://codereview.qt-project.org/6511
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-12 11:39:41 +02:00
Christian Kamm
b5a92a1957 Json: Use the javascript editor for json files. 
Task-number: QTCREATORBUG-4639
Change-Id: Icd0fda434d5ca66056d784dd87240db76e8a442c
Reviewed-on: http://codereview.qt-project.org/6035
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-12 11:34:36 +02:00
Christian Kamm
7ed717ca62 QmlJS: Add more value_casts. 
And switch all existing dynamic_casts to value_casts.

Change-Id: I93b89358e4802080f40b332074c64f4e91a2bc4c
Reviewed-on: http://codereview.qt-project.org/6311
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-12 10:55:55 +02:00
Christian Kamm
90925c69f6 QmlJS: Rename QmlObjectValue -> CppComponentValue. 
Reviewed-by: Fawzi Mohamed
Reviewed-by: Thomas Hartmann
Change-Id: Ib89388d5a5678403e4637eec5829f3520637ee27
Reviewed-on: http://codereview.qt-project.org/6310
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-12 10:52:56 +02:00
Christian Kamm
8c94325a03 QmlJS: Always allow changing name in 'make component' quickfix. 
Reviewed-by: Fawzi Mohamed
Change-Id: I95a3ea500482731e1a4633683339ff5acd052218
Reviewed-on: http://codereview.qt-project.org/5975
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Sanity-Review: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-12 10:42:24 +02:00
Christian Kamm
8c8f5270c2 QmlJS highlighter: Highlight name after 'as' in imports. 
Also fix a problem with the scope not being updated after initial
construction.

Change-Id: If5cf70bb029857b317ebbee3a6c4ee421213f24c
Reviewed-on: http://codereview.qt-project.org/6115
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-10-12 10:30:03 +02:00
Christian Kamm
55713a1514 QmlJS checks: Add severity and unique id to messages. 
Change-Id: I2cded26524c3f64152107e65d740658e3003ffac
Reviewed-on: http://codereview.qt-project.org/5790
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-10-10 14:39:20 +02:00
Christian Kamm
a7f78991c9 QmlJS: Move commonly used functions to qmlutils.h. 
Change-Id: I22376d96fe575bc00a55094c06af80e32a5587e6
Reviewed-on: http://codereview.qt-project.org/6238
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2011-10-10 09:36:12 +02:00
Christian Kamm
909c61247c QmlJS: Allow 'var' property type. 
It's new in Qt 5.

Change-Id: If3e670d42528ca6996ae280d96077ce744d281d9
Reviewed-on: http://codereview.qt-project.org/6121
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-10-06 10:58:29 +02:00
Christian Kamm
fdd0a15ef4 QmlJS: Separate metaObjectRevision from minor version number. 
They need not to be identical. Additionally:
* Rename ImportInfo::name to path, because that's what it does.
* Add ImportInfo::name, for getting the uri with the names
  separated by dots.
* Allow for exportMetaObjectRevisions in qmltypes files.
* Allow for exports with an empty type name, as generated by
  qmlRegisterRevision. They are used for associating meta object
  revisions with non-exported types.
* Rewrite the Qt 4.7 import to QtQuick 1.0 at an early stage. In
  preparation for the Qt 5 type information update, where Qt 4.7
  is gone.

Change-Id: Ia287193623d9530a56b9eb8d2481d50aabd94c3e
Reviewed-on: http://codereview.qt-project.org/5309
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-09-26 12:04:16 +02:00
Jarek Kobus
2244911826 Implement Code Style schemes 
Task-number: QTCREATORBUG-5092

Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-23 10:23:15 +02:00
hjk
7bfde77d7c s/error_message/errorMessage/g 
Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710
Reviewed-on: http://codereview.qt-project.org/5312
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-21 13:06:52 +02:00
Eike Ziller
0cea87f55b Move some settings pages. 
Reducing vertical size of preferences dialog, and moving languages
settings adjacent.

Change-Id: I1cb5a4310350a0552c920982854f671ae443ed7e
Reviewed-on: http://codereview.qt-project.org/5251
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-20 17:36:49 +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
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
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
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
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
Christian Kamm
038c695991 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>
 2011-09-14 13:00:36 +02:00
Christian Kamm
5b1a24ab95 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>
 2011-09-14 13:00:29 +02:00
Christian Kamm
1a0fb751cd 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>
 2011-09-14 11:51:35 +02:00
Christian Kamm
4b2f42cf87 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>
 2011-09-14 11:48:22 +02:00
Christian Kamm
bbc48690e8 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>
 2011-09-14 11:00:53 +02:00
Eike Ziller
fdeb7620f1 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>
 2011-09-14 10:55:20 +02:00
Eike Ziller
1e47de1416 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>
 2011-09-13 15:38:47 +02:00
Eike Ziller
5990b039e8 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>
 2011-09-13 15:37:37 +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 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
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
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
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone 
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 18:04:55 +02:00
Christian Kamm
cf96bc10d2 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>
 2011-09-02 10:37:31 +02:00