summaryrefslogtreecommitdiff
path: root/src/libs/qmljs
Commit message (Collapse)AuthorAgeFilesLines
* Remove trailing comma in an enumThiago Macieira2013-12-121-1/+1
| | | | | | | | | qmljsconstants.h(53): warning #271: trailing comma is nonstandard [and many more] Change-Id: I2224b7fe6ae1954b27d2b2bfebd469e1ca472f7b Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Remove function acceptIndented that is not used anywhereThiago Macieira2013-12-061-5/+0
| | | | | | | | | | | Found by ICC: warning #177: function "<unnamed>::Rewriter::acceptIndented" was declared but never referenced Change-Id: I37892d021a4ca9886fd35fea00102d44fa99320f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlJS: Fixing warningsThomas Hartmann2013-11-262-2/+37
| | | | | | | | | | Correcting ImportKey::compare(). The compare function was not stable and QMap did not work properly. Done with: Fawzi Change-Id: I11790215cba6944bf9f04be0c3844b35ea54ea70 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlJS: QmlDesigner warnings should be warningsThomas Hartmann2013-11-251-3/+3
| | | | | | Task-number: QTCREATORBUG-10898 Change-Id: I6d8a1b1523d72950fad25eb8545c24085552b226 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmljs: improve suggestion orderingFawzi Mohamed2013-11-251-2/+5
| | | | | | | | | | | change matchStrength sp that a contigous prefix is always preferred Task-number: QTCREATORBUG-10638 Change-Id: I532d93eddae1ad39157ff65e96fc6651200264ab Change-Id: I1001f5f4b78bac84b8df8ddc4c394c68359f7821 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: fixing testsFawzi Mohamed2013-11-222-9/+13
| | | | | | Change-Id: I8f2eaa64f3cb923753234de76f3491d4daa034fa Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Fix wrong header file name in QMLJSKai Koehne2013-11-211-1/+1
| | | | | | | | Fix a qmake warning introduced in e1b44e870f5c15 . Change-Id: I8f7913ceabc411044785634d1708fbc035b0a5c4 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmljs: fix import cacheFawzi Mohamed2013-11-212-10/+27
| | | | | | | correct update of m_importCache Change-Id: I70a2c6777c8f0e8df7b130fcff96cd67f83ca3e4 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlJS: Simplify code, fix MSVC-warning.Friedemann Kleint2013-11-201-9/+6
| | | | | | | | | qmljsviewercontext.cpp:80: warning: C4715: 'QmlJS::ViewerContext::languageIsCompatible': : not all control paths return a value. Change-Id: I22279ef7a43873b9c8f3d73d3826b59d5abaa390 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlJS: Fix compilation with Qt4Nikolai Kosjar2013-11-202-2/+2
| | | | | Change-Id: I036f2ccf07b836ecff63a055e3204327d006c0d0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* qmljs: scan importsFawzi Mohamed2013-11-204-7/+87
| | | | | Change-Id: Ied59f5d56c5816d9da57f23a619d604acec76000 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: fingerprints for documents, libraries and FakeMetaObjectsFawzi Mohamed2013-11-205-20/+190
| | | | | Change-Id: Ib9c9b86fbed19539dc42696292bdb3b93dd1b575 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: new import/dep trackingFawzi Mohamed2013-11-2015-21/+1275
| | | | | Change-Id: I9f4de2a06aad3afb80372a4b80e56db658683575 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlJS: Add warning if we use a Qt Quick 1 code model for Qt Quick 2Thomas Hartmann2013-11-144-3/+34
| | | | | | | | | In some cases we use a Qt Quick 1 code model for a file with Qt Quick 2 imports. This patch adds a warning for this, since auto completion is incomplete. Change-Id: I60888fd269c02f38da097104f5ecc982dd65573a Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Braces cleanupOrgad Shaneh2013-11-143-9/+5
| | | | | Change-Id: I8413252c90a1487d291f15d92837c30ab697b245 Reviewed-by: hjk <hjk121@nokiamail.com>
* qmljs: use new qml parserFawzi Mohamed2013-11-0628-1492/+2203
| | | | | | | | adds support for singleton and getter/setter properties Change-Id: Ia6691ac7799a46885db0df44617617dcc3c13189 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: simple tracking of used modulesFawzi Mohamed2013-10-232-1/+11
| | | | | Change-Id: Idc977a8c5a6c6caa3749599cb6f4a236046f53d7 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmljs: added qmljsconstants.hFawzi Mohamed2013-10-2319-164/+213
| | | | | | | | | | | | | | Moved Document::Language, Import::Type and StaticAnalysis::Severity enums to qmljsconstants.h and renamed values removing the redundant part. Thus the effective length changed little or improved (Document::QmlLanguage => Language::Qml). The separate file allows better reuse of enum values without introducing circular dependencies. Change-Id: I5186d7c04f5d3f6c289068b919be5ff1ff118326 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Rename "[Mm]ethod(s)" to "[Ff]unction(s)"Nikolai Kosjar2013-10-105-7/+7
| | | | | | | | | | | Only methods as programming functions are affected. Besides renaming some actions like "Switch Between Function Declaration/Definition" this mostly touches (api) code comments. This is a follow-up patch to commit 872bfb7. Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92 Reviewed-by: hjk <hjk121@nokiamail.com>
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-1/+1
| | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-09-274-25/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/extensionsystem/pluginmanager.cpp src/libs/extensionsystem/pluginspec.cpp src/plugins/coreplugin/basefilewizard.cpp src/plugins/coreplugin/coreplugin.pro src/plugins/coreplugin/coreplugin.qbs src/plugins/coreplugin/editormanager/ieditor.cpp src/plugins/coreplugin/externaltool.cpp src/plugins/coreplugin/icore.cpp src/plugins/cpptools/cppmodelmanager.cpp src/plugins/fakevim/fakevimhandler.cpp src/plugins/find/ifindfilter.cpp src/plugins/projectexplorer/buildstep.cpp src/plugins/projectexplorer/devicesupport/idevice.cpp src/plugins/projectexplorer/runconfiguration.cpp src/plugins/vcsbase/vcsbaseeditor.cpp tests/system/suite_debugger/tst_simple_analyze/test.py Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
| * Doc: edit qmljs docsLeena Miettinen2013-09-234-25/+27
| | | | | | | | | | | | | | | | Use standard wording, fix capitalization, typos, and style and grammar issues. Change-Id: Iac3faa59ef32aa2a8ec1857aed0d861701cbfbe7 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | QmlJs: Remove dead codeTobias Hunger2013-09-121-24/+0
| | | | | | | | | | Change-Id: I87cfb48652ab747e14ddcc8b3c5da55f5fcaa48d Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Remove superfluous include paths from project files.Christian Kandeler2013-09-022-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of our build system files specify unneeded include paths. These roughly fall into the following categories: a) Paths that are already set in more general files such as qtcreator.pri. b) Paths that serve no purpose at all, possibly left over from earlier versions of the project. c) Paths that act as workarounds for wrong include statements of the form '#include "xyz.h"', where xyz.h is not in the same directory as the including file. This patch removes such path specifications and fixes the offending include statements from case c). Tested on Linux, Windows and OSX with qmake and qbs. Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Reduce usage of QStringRef::toString() in QmlJS/QmlJSTools.Friedemann Kleint2013-08-294-8/+10
| | | | | | | | | | Change-Id: I9db2a0b21bf430d6f450e1e860a0c2a02272536f Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Merge remote-tracking branch 'origin/2.8'Oswald Buddenhagen2013-08-274-0/+105
|\ \ | |/
| * qmljs: add vector*d, quaternion, and matrix4x4 to code modelFawzi Mohamed2013-08-224-0/+105
| | | | | | | | | | | | | | | | | | | | Added vector2d vector4d, quaternion and matrix4x4 to basic types and extended completions related to them in the code model. Task-number: QTCREATORBUG-9929 Change-Id: Iafdbdf5792f640e8eb29d866a372542ee07159a5 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Qbs project files: Use groups wherever applicable.Christian Kandeler2013-08-211-95/+71
| | | | | | | | | | | | | | Provides better structuring of source files. Change-Id: Ic2d0094312bb7c8da01a1f38270564407fdbefce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | QmlJS: Fix grammar fileTobias Hunger2013-08-091-1/+1
| | | | | | | | | | | | | | | | Do not reintroduce clang warnings when regenerating code from the grammar file. Change-Id: Ic065191b93e68d88792fedac9784e4fbeff08d6f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | QmlJSParser: Fix build issue with clangTobias Hunger2013-08-091-1/+1
| | | | | | | | | | | | | | Erik promised to fix this upstream. Change-Id: If78e7eee20188d3be77ca9e7e53714ea5740d4d8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Fix build with qbsTobias Hunger2013-08-061-0/+2
| | | | | | | | | | Change-Id: Iff654636522bd41e96dfae6183f95c4dfcb53829 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | QML: add a memory pool to the Json* classes.Erik Verbruggen2013-07-171-1/+3
| | | | | | | | | | | | | | | | The memory pool is not too efficient, but will keep objects from leaking. Change-Id: I68a55bc7a6ea56463652245abeea8954b693c1d7 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Fix coding style for else statementsOrgad Shaneh2013-07-175-13/+11
|/ | | | | Change-Id: I1309db70e98d678e150388c76ce665e988fdf081 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qmljs: add console.warn,...Fawzi Mohamed2013-07-102-5/+33
| | | | | | Task-number: QTCREATORBUG-7033 Change-Id: I100cd6759534e5e94246f999481f5217f9e51b31 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Doc: use standard wording in \brief commandsLeena Miettinen2013-06-2010-14/+18
| | | | | | | | | QDoc does some magic with the \class and \namespaces and \brief commands, so the following wording must be used: "The xxx class yyy ..." Change-Id: Id231f30e8464898b776888d5423523de404aae34 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qmljs: add qrc files that are not resources without warningsFawzi Mohamed2013-06-061-1/+2
| | | | | | Change-Id: I2e768b6f14c0099769cb8a4b13052c7f0b8f88a9 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Doc: Remove \fn lines adjacent to functionsOrgad Shaneh2013-06-052-5/+0
| | | | | | | They are unneeded, some of them are unmaintained Change-Id: I0ad87e152d8e2328b486b2f904f7cf9613004afe Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qmljs: adding qrc supportFawzi Mohamed2013-06-0312-17/+701
| | | | | | | | | | | | | | | | | | | | | Qmljs now keeps a cache of parsed qrc files, and can resolve "qrc:" links. This breaks the assumption that the name that the qml files has on the filesystem is the one that qml sees, and that contents of directories can be found just looking at file whose path starts with the directory path. Currently the first file is used when multiple qrc files contain the same path, but support for strict and weak path resolving is already there. At the moment only qrc files for projects that call updateQmljsCodeModel are updated. ChangeLog: QmljsSupport: Imports using qrc links are resolved. Task-number: QTCREATORBUG-8953 Change-Id: I695fac2692af2417d49c192c580a1c2e7b4873f4 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-05-281-2/+0
|\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/analyzerbase/analyzerbase.qbs src/plugins/qmljseditor/qmljseditor.qbs src/plugins/qt4projectmanager/qt4projectmanager.qbs Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11
| * Remove duplicate module dependencies from qbs files.Christian Kandeler2013-05-271-2/+0
| | | | | | | | | | | | | | These cause a warning now. Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-05-271-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/android/androiddebugsupport.cpp src/plugins/qtsupport/qtsupport.qbs Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
| * rename ProductModule into ExportJoerg Bornemann2013-05-271-1/+1
| | | | | | | | | | | | | | | | This fixes a bunch of warning when building with the updated qbs version. Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | TypeDescriptionReader: Check for files that are not UTF8 encodedThomas Hartmann2013-05-152-8/+22
| | | | | | | | | | | | | | | | We had a qmltypes file that was encoded in UTF16 and did not work. We should at least warn about it. Change-Id: I42555782ee16ddd25552f919845aa85ff1f3f636 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-04-301-2/+3
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
| * qmljs: add explicit -relocatable flag to qmlplugindumper and use itFawzi Mohamed2013-04-251-2/+3
| | | | | | | | | | | | | | This will allow changing the default to nonrelocatable. Change-Id: I80746a3e70f94040a407cc25cec9ad6fac8b6fec Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.7'Eike Ziller2013-04-112-9/+19
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/plugins/cpptools/cppchecksymbols.h src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
| * QmlJSStaticAnalysis: make PrototypeMessageData publicThomas Hartmann2013-04-102-9/+19
| | | | | | | | | | | | | | We need this in the rewriter to avoid warning. Change-Id: Ia99583e080eed936d98517ce553294d3040f8cee Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Export TypeDescriptionReaderAlan Alpert2013-04-081-1/+1
| | | | | | | | | | | | | | Allows use in external tools. Unsupported still, but possible. Change-Id: I947adc6a6dbccf676112ac77e186134fb660efd2 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Clean headers in QmlJs.Friedemann Kleint2013-04-0428-67/+4
| | | | | | | | | | | | | | | | Ran script to remove inludes on a trial-and-error basis and manually corrected it (Parser excluded). Change-Id: I5ec6e1076430009bb72094411b2c3386f8bea548 Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* | derive TARGET from QTC_{LIB,PLUGIN}_NAMEOswald Buddenhagen2013-04-031-1/+0
| | | | | | | | | | | | | | | | the information is redundant now Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
View Lorry Controller Status