feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
19,637 Commits 108 Branches 368 Tags
852d84dae5067f7af4bca24782f1384d497cf684
Commit Graph

91 Commits

Author SHA1 Message Date
Christian Kamm
8742026380 QmlJS: Allow for QML modules with version subdirectories. 
That means
import Foo 2.1
can resolve to
/path/Foo.2.1 or
/path/Foo.2 or
/path/Foo

Task-number: QTCREATORBUG-4607
Change-Id: Ie1efc5be2ca2ed3ccc130e8a662f94aed11bec1a
Reviewed-on: http://codereview.qt.nokia.com/194
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-05-30 08:25:19 +02:00
Christian Kamm
96cde1e9de QmlJS: Fix import cache usage with 'as' imports. 
Change-Id: I6c057e494f87df927adc7b83c6caf1ecc729ac65
Reviewed-on: http://codereview.qt.nokia.com/176
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-05-27 11:49:01 +02:00
Christian Kamm
a7f4e5fab5 QmlJS: Separate imported types and imported JS scopes. 
Task-number: QTCREATORBUG-4981
Change-Id: I06d3e428ca4928296a3d5977aeff29fc3217c37c
Reviewed-on: http://codereview.qt.nokia.com/175
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-05-27 11:48:53 +02:00
Christian Kamm
d67b7d17dc QmlJS: Refactor ObjectValue members. 
* property -> lookupMember
* setProperty -> setMember
* removeProperty -> removeMember

Change-Id: I638479ee2b90b684283e714630bdcab237f6b3f2
Done-with: Fawzi Mohamed
Reviewed-on: http://codereview.qt.nokia.com/77
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
 2011-05-24 11:55:03 +02:00
Christian Kamm
4937769eab QmlJS: Don't add invalid imports to TypeEnvironment. 
Done-with: Fawzi Mohamed
 2011-05-16 12:21:20 +02:00
Christian Kamm
cf15e14e5e QmlJS: Add tooltips to imports. 
Task-number: QTCREATORBUG-4814
 2011-05-12 15:29:41 +02:00
Christian Kamm
d0b12f8f19 QmlJS: Remove unused argument for Link helper function. 2011-05-11 09:13:13 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Christian Kamm
d05992d0fa QmlJS: Stop doing significant work in constructors. 
To avoid order-of-initialization problems.

Reviewed-by: Thomas Hartmann
 2011-05-06 13:48:55 +02:00
Christian Kamm
02b7eacf4b QmlJS: Fix type detection for alias properties. 
Task-number: QTCREATORBUG-2306
 2011-05-04 11:14:35 +02:00
Christian Kamm
c504d28eb5 QmlJS: Add semantic errors to task window. 
Task-number: QTCREATORBUG-4103
Reviewed-by: Leandro Melo
 2011-04-21 11:16:50 +02:00
Christian Kamm
e21311132b QmlJS: Fix library-by-path imports. 
Fixes the problem 5426c3ac2c and
7b25f438c6 worked around.

Reviewed-by: Erik Verbruggen
 2011-04-21 11:16:14 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Kai Koehne
3e07024e10 QmlJS: Don't warn user about imports if static info is available 
Don't underline the import if a qmldump fails,
but the typeinfo is available via a .qmltypes file. That should allow
users to 'fix' qmldump issues by shipping a .qmltypes file.

Reviewed-by: Erik Verbruggen
 2011-04-12 11:27:17 +02:00
Erik Verbruggen
7b25f438c6 Fixed import of "." in a library with a hack. 
Task-number: QTCREATORBUG-4198
Reviewed-by: Kai Koehne
 2011-04-06 10:49:27 +02:00
Christian Kamm
5e78fef6c5 QmlDump: Fix uri-based plugin dumping. 2011-03-16 15:35:15 +01:00
Christian Kamm
b980a9b964 QmlJS: Fix implicit "." import when . has a QML module. 
Reviewed-by: Erik Verbruggen
 2011-03-10 15:03:36 +01:00
Christian Kamm
aeb8c352ee QmlJS: Try to implicitly import libraries in the same directory. 
In QML, the current directory that holds a QML file is imported
implicitly. If it contains a qmldir file, the library is imported.

Since there is no explicit import statement, Creator can't know the URI
of this library. However, if type information is available for it
already - either through a previous dump or a qmltypes file - we can
guess the URI by looking at the contained exports.

Task-number: QTCREATORBUG-3768
 2011-02-25 16:23:12 +01:00
Christian Kamm
4fc2032e10 QmlJS: Put types with cpp names into a separate package. 
In preparation of relocatable plugin types.
 2011-02-09 10:42:49 +01:00
Christian Kamm
c935fd36d7 qmldump: Use the new qmldump correctly. 2011-02-09 10:42:49 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Christian Kamm
283a3d32cd Qml/C++: Fix performance problem with type extraction. 
By moving the offending code into a background thread.

Reviewed-by: Erik Verbruggen
 2011-01-06 15:02:06 +01:00
Christian Kamm
0194da7300 Qml-C++: Find C++ qmlRegisterType calls and populate QML code model. 
Reviewed-by: Erik Verbruggen
 2011-01-04 15:58:22 +01:00
Christian Kamm
5de7be5f91 LanguageUtils: Add FakeMetaObject and ComponentVersion. 2011-01-04 15:58:21 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Christian Kamm
5dd92328fb QmlJS: Improve error reporting for failed plugin dumps. 
Reviewed-by: Erik Verbruggen
 2010-11-25 15:06:44 +01:00
Christian Kamm
3f505e9982 QmlJS: Add initial 'Find Usages' support. 2010-09-24 14:11:06 +02:00
Christian Kamm
13faf49322 QmlJS: Fix segfault during import resolution. 2010-09-24 13:28:01 +02:00
Christian Kamm
c7b3e3c81c QmlJS: Speed up Link significantly, provide more info on imports. 
Link now caches imports. That means importing the same library (say, Qt)
from more than one file no longer creates an importing namespace for
each one. Instead, a single one is created for the instance of Link.

To make this work, the type environment in ScopeChain has been given its
own type: Interpreter::TypeEnvironment. That has the added benefit of
being able to carry meta-information about imports. You can use
TypeEnvironment::importInfo(qmlComponentName) to get information about
the import node that caused the import of the component.
 2010-09-16 15:51:21 +02:00
Christian Kamm
8df6dd6d7d QmlJS: Add initial documentation for the base classes of the code model. 2010-09-15 15:26:34 +02:00
Roberto Raggi
ba03239749 Concate strings instead of using the QDir API to speed up the linking phase. 
Reviewed-by: Christian Kamm
 2010-09-08 15:13:12 +02:00
Christian Kamm
88601712c6 QmlJS: Make ScopeChain more const-correct. 
We don't want people modifying the shared component chain on a
const Context *.
 2010-08-30 14:12:06 +02:00
Christian Kamm
1a9c69ddb0 QmlJS: Fix crash when opening JS files. 
Now that Contexts are cached, it needs to be copyable. However, the
ScopeChain has a QmlComponentChain member that owns resources and didn't
have a correct copy constructor or copy assignment operator.

I've made QmlComponentChain non-copyable and store a shared pointer to
an instance instead, as it will generally not change for a given
context.

Reviewed-by: Lasse Holmstedt
 2010-08-27 09:42:07 +02:00
Christian Kamm
7a8c07a1f8 QmlJS: The Script type is no longer implicitly available. 2010-08-25 14:55:16 +02:00
Christian Kamm
36e8b65d59 QmlJS: Fix running qmldump on plugins that require a specific uri. 
The builtin QML plugins require to be imported with the full uri, i.e.
import Qt.labs.particles 1.0
so setting the import path to imports/Qt/labs and doing
import particles 1.0
is not supposed to work. (see QTBUG-11139)

This change adjusts qmldump to take an import path *and* the import uri,
so it will be able to dump the type information for these plugins.

Reviewed-by: Erik Verbruggen
 2010-08-25 14:19:44 +02:00
Christian Kamm
6ee1027eaa Add missing license headers. 2010-07-09 15:47:25 +02:00
con
ede2a7c975 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/gdbmacros/dumper.py
	src/libs/qmljs/qmljs-lib.pri
	src/plugins/debugger/breakhandler.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
 2010-06-30 14:25:09 +02:00
Christian Kamm
4271d2a21f QmlJS: Make the qml instantiating component chain more useful. 
By actually storing the documents instead of only the root and id
environments.
 2010-06-25 17:10:14 +02:00
Christian Kamm
123607ad70 QmlJS: Make variables in imported JS documents show up in completion. 
Filtering them out has long since become unnecessary. It was used back
when JS files were sourced from Script elements - there they'd only
make the functions available. Now functions and variables are imported.

Task-number: QTCREATORBUG-1735
Reviewed-by: Erik Verbruggen
 2010-06-25 13:34:45 +02:00
Christian Kamm
e307bc2506 QmlJS: Store plugin metatypes in LibraryInfo. Rework type loading. 2010-06-09 14:36:54 +02:00
Christian Kamm
f9d7872761 QmlJS: Use ComponentVersion everywhere. 2010-06-09 14:36:53 +02:00
Christian Kamm
822520c304 QmlJS: Get at types defined in plugins by running qmldump on them. 
Task-number: QTCREATORBUG-1021
Reviewed-by: Roberto Raggi
 2010-06-09 14:36:53 +02:00
Christian Kamm
0d5d6344bd QmlJS: Collect import version numbers in Bind. 2010-06-09 14:36:53 +02:00
Christian Kamm
70291f457a QmlJS: Add null checks when accessing Bind::rootObjectValue. 
If a document wasn't parsed correctly the binder won't be run - and
rootObjectValue will be null.

Task-number: QTCREATORBUG-1449
 2010-05-20 14:02:25 +02:00
Christian Kamm
50cc55af80 QmlJS: Change to a nicer way of marking strings for translation. 
Reviewed-by: ossi
 2010-05-19 13:32:11 +02:00
Christian Kamm
9af4f2c64f QmlJS: Remove unused function environment from binder. 
This used to contain all functions declared in Script blocks. With them
gone, there's no reason to keep it.
 2010-04-28 10:01:36 +02:00
Christian Kamm
71b9057b0b QmlJS: The qml document's path is no longer an implicit import path. 2010-04-26 10:43:59 +02:00
Christian Kamm
3096b2a06f QmlJS: Set importing scopes for scripts correctly. 
They had not yet been updated to the new way of importing javascript.

Reviewed-by: Erik Verbruggen
 2010-04-22 16:36:43 +02:00
Christian Kamm
3286f48504 QmlJS: Remove Link::scopeChainAt, initialize scope chain in constructor. 
Use ScopeBuilder.push(...) for the same functionality.

Reviewed-by: Erik Verbruggen
 2010-04-22 16:36:43 +02:00