summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/qmljsbind.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QmlJS: Tr::TrAlessandro Portale2023-02-011-4/+8
| | | | | | | | Excluding the Qml parser, which needs to remain in sync with it's copy in Qt. Change-Id: I22f475f265dd74687e3239c4d6916c777798a447 Reviewed-by: hjk <hjk@qt.io>
* Remove GPL-3.0+ from license identifiersKai Köhne2023-01-061-1/+1
| | | | | | | | | | | | | | | Since we also license under GPL-3.0 WITH Qt-GPL-exception-1.0, this applies only to a hypothetical newer version of GPL, that doesn't exist yet. If such a version emerges, we can still decide to relicense... While at it, replace (deprecated) GPL-3.0 with more explicit GPL-3.0-only Change was done by running find . -type f -exec perl -pi -e "s/LicenseRef-Qt-Commercial OR GPL-3.0\+ OR GPL-3.0 WITH Qt-GPL-exception-1.0/LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0/g" {} \; Change-Id: I5097e6ce8d10233993ee30d7e25120e2659eb10b Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qmljs: Remove foreach usageArtem Sokolovskii2022-12-211-2/+3
| | | | | | | | Task-number: QTCREATORBUG-27464 Change-Id: Ifdb8cf514dfe328e0a64bde1beff3e63a4b7fbc3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* qmljs: correctly handle js string templatesFawzi Mohamed2022-03-211-0/+6
| | | | | | | | | | | | | | In most cases we do want to visit the expressions in a function template. Changing its accept0 would force those not wanting to visit it to iterate on the templates (currently a linked list), so we add a visit method explicitly visiting the expression in all the needed places. Fixes: QTCREATORBUG-21869 Change-Id: I47733544bfd32eec357810b97242608b8f7de572 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
* QML/JS: Fix punctuation of messageLeena Miettinen2022-02-181-1/+1
| | | | | | Task-number: QTCREATORBUG-27055 Change-Id: Ibaa37fc49e9ae3671cc7904b63682d245c0bdd8d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlJS: Fix crashChristian Stenger2021-09-091-3/+5
| | | | | | | Fixes: QTCREATORBUG-26151 Change-Id: Ibfc2a17f0eb8eb7c4804045dba9a1963249ba860 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* Support for QML module mappingErik Verbruggen2021-03-191-3/+5
| | | | | | | | | | | | | QUL uses module mapping for theming of QtQuick.Controls: during code-generation the compiler is pointed to the Controls implementation it should use. This is done by rewriting any import of QtQuick.Controls with the given module name. The CMake build scripts will write a file for each target to the directory "qml_module_mappings" in the build dir, and those files will contain the mappings used. Fixes: QTCREATORBUG-25356 Change-Id: I3f74897836dde7717b03bd6dffa46dcc0689ffdd Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
* qmljs: convert QStringView -> QString in +=Fawzi Mohamed2021-02-031-1/+1
| | | | | | | | += using QStringView is available only in newer Qt Change-Id: I67e1cbbfcba07cca826ee4353d0cac08bf46defe Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qmljs: support inline componentsFawzi Mohamed2021-02-031-5/+33
| | | | | | | | | | | | | | | | | * add inline components to bind. * inserts inline components in the component that contains them (makes Context:lookupType simpler) * unify Context:lookupType overloads without adding extra heap allocations using a template (avoid code duplication) * add tests for inline components * warn about nested components * use model manager to load dependencies in tst_check (old test did not load dependencies and simply skipped all checks on imports) Fixes: QTCREATORBUG-24766 Fixes: QTCREATORBUG-24705 Change-Id: Ibcade7752cdaa08e960f66db3a724ab7fb3268cf Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmljs: fix check for version check in importFawzi Mohamed2021-01-281-1/+1
| | | | | | Change-Id: I77d0bdfdaeb79f8881bdf9ec52077cf1b70faf64 Fixes: QDS-3667 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* qmljs: Suppress "package requires a version number" with unknown QtFawzi Mohamed2021-01-221-2/+2
| | | | | | | | | | | | Assume Qt6 instead of the version creator was built against when we cannot get the qtVersion one builds against. This is a better default and avoiding spurious warnings for example when building qt. Fixes: QTCREATORBUG-24533 Change-Id: I53dc6387229c510c390b41af8866c2e9b2ece3de Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QmlJS: Ensure QtQuick is the first importMiikka Heikkinen2020-11-161-1/+6
| | | | | | | | | | | | Some items will show empty property panel and cannot be reparented in QmlDesigner if the module that defines the item is imported before QtQuick module. This fix ensures QtQuick module is always imported first. Change-Id: Ie610fef681f5bf0ac62d1b879bb9306d4f7d293b Fixes: QDS-3115 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QmlJS: accept import without versionFawzi Mohamed2020-10-011-1/+9
| | | | | | | | | Since Qt 6 import without version are accepted and should import the latest version. Change-Id: Id98bd0f7664dd77b30b9c91ee153fccc4160fc6d Fixes: QTCREATORBUG-24533 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Update qmljs parser to Qt 5.15 parserFawzi Mohamed2020-03-031-8/+7
| | | | | | | | | | | | | * parser side support for annotations, inline components, new UiVersion and all the things included in QT 5.15 parser * SourceLocation moved from QmlJS:AST to QmlJS * Visitors now need to handle throwRecursionDepthError * BaseVisitor for visitors that want to override all visit Task-number: QTCREATORBUG-23591 Change-Id: I682a30d0b08b6c929739fd0e339ef6fbde3eb630 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Some clang-tidy -use-modernize-nullptrhjk2019-08-011-11/+11
| | | | | Change-Id: I1bed5e85a5b7948d08502a72a10f80baa075c204 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* qmljs: update parserMarco Benelli2018-11-221-5/+5
| | | | | | | | | Update the qtcreator qmljs parser to the one of Qt 5.12. It supports EcmaScript 7. Task-number: QTCREATORBUG-20341 Change-Id: I0d1cff71402ba17e22cde6b46c65614e162280de Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* QmlJs: Make "qbs" an implicit import for qbs filesJoerg Bornemann2018-06-211-0/+13
| | | | | | | | | | | We want to have qbs syntax highlighting, even if the import qbs statement is missing, because we want to remove the reqirement for it. Change-Id: I569be825440bc733c3c0fa8e146e785060e08384 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Marco Benelli <marco.benelli@qt.io>
* QmlJs: remove bundles for QtQuick1 type descriptionsMarco Benelli2018-01-081-5/+1
| | | | | | | | QtCreator now assumes that QtQuick2 is used, so the relevant bundle is loaded unconditionally. Change-Id: Ib6b7b0c9a949e74edf0e0b7f68b0c774d7bcb451 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update remaining files in src Change-Id: I1896f17fcf34f71c3310c87899fb5171b8e4afb1 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | qmljs: improve handling of qml dialectsFawzi Mohamed2014-07-301-5/+5
|/ | | | | | | | | | | | | Language::Enum -> QmlDialect * class instead of enum * moved Language specific operations to it (from Document) * nicer handling QStringList -> PathsAndLanguages * store language along with path, to perform a correct scan and improve path handling Change-Id: If69d35c63cfeb48aa670b51870916cd0c40f1916 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: switch to the new category loggingFawzi Mohamed2014-07-011-2/+0
| | | | | Change-Id: Id4e43779590939e9d6dd2d0dab536f70e721f097 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qmljs: fixing testsFawzi Mohamed2013-11-221-9/+11
| | | | | | Change-Id: I8f2eaa64f3cb923753234de76f3491d4daa034fa Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: added qmljsconstants.hFawzi Mohamed2013-10-231-5/+5
| | | | | | | | | | | | | | 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>
* Reduce usage of QStringRef::toString() in QmlJS/QmlJSTools.Friedemann Kleint2013-08-291-2/+3
| | | | | Change-Id: I9db2a0b21bf430d6f450e1e860a0c2a02272536f Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Fix coding style for else statementsOrgad Shaneh2013-07-171-2/+2
| | | | | Change-Id: I1309db70e98d678e150388c76ce665e988fdf081 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: use standard wording in \brief commandsLeena Miettinen2013-06-201-1/+1
| | | | | | | | | 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>
* Clean headers in QmlJs.Friedemann Kleint2013-04-041-4/+0
| | | | | | | | 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>
* Fix Krazy warnings about includes/header guards in QML-JS-code.Friedemann Kleint2013-03-121-1/+1
| | | | | Change-Id: I18fc13b8ac2b2c7a3a50bea2be1434667bc5c56f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* qmljs: add infrastructure handling qml dialects betterFawzi Mohamed2013-02-211-3/+16
| | | | | | | | | | | | | | | | | | QmlBundles enables us to treat the different qml dialects differently. Add imports completion. Change-log: [Qml/JS Support] Corrected handling of QtQuick2 only features. Change-log: [Qml/JS Support] Added import completion in editor. Task-number: QTCREATORBUG-8750 Task-number: QTCREATORBUG-8624 Task-number: QTCREATORBUG-8584 Task-number: QTCREATORBUG-8583 Task-number: QTCREATORBUG-8429 Change-Id: I1384b1b23136a85b4d077895ea86f92960da9e71 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QmlJSBind: Set Root ObjectAurindam Jana2012-05-031-1/+1
| | | | | | | | | | Avoid re-setting the root object of the document. Task-Number: QTCREATORBUG-7379 Change-Id: I9d2209bf2e3dba8d9784fffe087859bddebeb16f Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com> Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-3/+3
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* QmlJS: Add documentation for QmlJS::Value.Christian Kamm2011-11-151-5/+4
| | | | | | | | | Also: * Remove unnecessary QmlJS:: qualifications in existing documentation. * Remove unnecessary explicit links in the documentation. Change-Id: Icb41941d98b5cfe9d2fb3b3887fafee16635eb13 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | QmlJS: Documentation.Christian Kamm2011-11-071-5/+7
| | | | | | | | | | | | Change-Id: I2a095e38b7d79a5fb39a16d8f32b48c8e28132f6 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* | QmlJS: Introduce UnknownValue.Christian Kamm2011-10-181-1/+1
| | | | | | | | | | | | | | To distinguish known-to-be-undefined from a genuinely unknown value. Change-Id: I606b4ea4d726f94553400b8950d3c0a4e76564a8 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* | QmlJS: Move commonly used functions to qmlutils.h.Christian Kamm2011-10-101-15/+1
|/ | | | | | | 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>
* QmlJS: Support .import directives in js files.Christian Kamm2011-09-281-30/+14
| | | | | | | | | | | * Allow .import... * Fix parsing of JS files when using Lexer::scanDirectives() * Clean up ImportInfo construction. * Rename ImportInfo::id to ImportInfo::as. Change-Id: I888da248f06dc6184db99aa74c3b50d7f2f5e491 Reviewed-on: http://codereview.qt-project.org/5625 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* QmlJS: Fix typo in building string uris.Christian Kamm2011-09-271-1/+1
| | | | | | Change-Id: I94421816f4bd30591925be42d7d386fac589e832 Reviewed-on: http://codereview.qt-project.org/5595 Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* QmlJS: Separate metaObjectRevision from minor version number.Christian Kamm2011-09-261-6/+15
| | | | | | | | | | | | | | | | | | 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>
* QmlJS: Simplify check if a document instantiates a component.Christian Kamm2011-09-141-55/+7
| | | | | | Change-Id: If45002ecec56ca766ef7a0c7878c0a48fadee452 Reviewed-on: http://codereview.qt-project.org/4734 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
View Lorry Controller Status