summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/qmljsinterpreter.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QmlJsLib: fix compiler warningNikita Baryshnikov2016-05-131-2/+2
| | | | | | | this 'else' clause does not guard Change-Id: Ica781d2fe0d179107ee121badb17e2078420ffba Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Qml code model: handle modules dependencies.Marco Benelli2016-04-191-3/+9
| | | | | | | | Fix the broken hierarchies between qml objects. Change-Id: Id36c735cab0129af382fab7b9dd90c228304168c Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* QmlJS: Fix resolution of "alias" directives in qrc filesUlf Hermann2016-03-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | Previously qrc paths of QML/JS documents were not considered for implicit imports. Only the path of the document in the file system was considered. The QML engine, however, doesn't know the original path at all and only uses the qrc paths for import resolution. This created a mismatch between what the QML engine could recognize and what the code model suggested. Without alias directives, any files imported from a qrc file would have to reside in the same directory as the one implicitly importing them, so this arrangement happened to work, most of the time. In order to support aliases we have to search the files in the same qrc path to figure out the imports. To do that, we keep a reverse map of qrc paths to files in the QrcParser and iterate that when resolving imports. Change-Id: I84baae6cbfbe96ddd5322c81494c1e4a3f473f3f Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* 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>
* Export explicitly instantiate templates.BogDan Vatra2015-11-171-2/+3
| | | | | | | LLVM & MSVC needs to explicitly export the instantiate templates. Change-Id: I51562750415400bfa561fd6e759211f2b4b10650 Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* qmljs: set cpp object to the latest version exportedMarco Benelli2015-09-171-1/+5
| | | | | | | | | m_objectsByQualifiedName did not prefer the latest meta object revision, as consequence at type exported both anonymously and with a name, would pick up one version randomly. Change-Id: I91baf2729d0a0bda61205a62d9a38d04b4da058e Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
* Qml&Js: properties/methods/enums inspectionNikita Baryshnikov2015-04-151-31/+28
| | | | | | | | .. of builtIn qml and cpp code over "Inspect API For Element Under Cursor" action. Change-Id: I70d5bec2933b682295c5242248a2b0f95dba4e76 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* qmljs: avoid warnings for empty qmltypes filesFawzi Mohamed2014-11-191-11/+11
| | | | | | Change-Id: I5cd29540afa5c7ec1a7031d6e698e873003b3f0a Task-number: QTCREATORBUG-13354 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
* Add QmlPrototypeReference::document() getterSebastian Sauer2014-10-151-0/+5
| | | | | | | | | | | Enable access to the private Document instance in the same way its done already in the ASTObjectValue class by adding a const getter. Change-Id: I0581e527bb766fc72682f2e38d0d8d52d4452deb Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@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>
* | Remove Qt version checks.Christian Kandeler2014-09-081-21/+0
| | | | | | | | | | | | | | | | Qt 5.3 is the minimum requirement these days. Remove all fallback code from sources and project files. Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmlJS: Don't translate debug outputKai Koehne2014-09-041-1/+1
| | | | | | | | | | Change-Id: I979427a5092fe15c1595a9a67c1d31bbe1911ab6 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* | Replace QLatin1String("x") with QLatin1Char('x') where possibleKai Koehne2014-09-041-4/+4
| | | | | | | | | | Change-Id: I2f90c8ae7b5e968b9de882833f8661ab540a9232 Reviewed-by: hjk <hjk121@nokiamail.com>
* | Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-09-031-4/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs src/plugins/coreplugin/editormanager/editormanager.cpp src/plugins/cppeditor/cppeditor.cpp src/plugins/remotelinux/remotelinuxdebugsupport.cpp src/plugins/texteditor/basetexteditor.cpp Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
| * QmlJS: Don't use QDir::separator() for internal pathsKai Koehne2014-09-031-2/+2
| | | | | | | | | | | | | | We use forward slashes in all internal paths, even on Windows. Change-Id: Ie0b418c770dad96829dd357fe425616b6d3a5b82 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
| * qmljs: fixing used importsFawzi Mohamed2014-08-281-2/+4
| | | | | | | | | | | | Task-number: QTCREATORBUG-12782 Change-Id: I44808f10504991fb9fc621acedd43035698c6afb Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | qmljs: uniform property infoFawzi Mohamed2014-07-291-12/+69
|/ | | | | | | | | CppComponent has extra information on properties that makes sense also for ObjectValues, change the processProperty method to pass in an extra struct with that info (and that can be later extended). Change-Id: If09b178a4095bed03ff59bfb2164088309d2c8e2 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Compile fix for Qt 4.8.6Robert Loehning2014-07-171-2/+2
| | | | | | | Task-number: QTCREATORBUG-12695 Done-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Change-Id: Id184bb051c08ee954474cca89308712e14710f23 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmljs: track origin of ObjectValuesFawzi Mohamed2014-07-171-16/+39
| | | | | | | | allows unique identification of types Change-Id: Id4e6a9c1fa23409b1e2d5eb32708a0bacd04a5da Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmljs: switch to the new category loggingFawzi Mohamed2014-07-011-8/+8
| | | | | Change-Id: Id4e43779590939e9d6dd2d0dab536f70e721f097 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qmljs: codestyle fixesFawzi Mohamed2014-05-231-279/+279
| | | | | Change-Id: I1b5a597d92e865d2235b15c62e3bbae362e5b7c0 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: exposing a bit more the existence of private value typesFawzi Mohamed2014-05-231-3/+76
| | | | | Change-Id: I85e29b0d60234407561ecbeb2883d68c1acb71d6 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* qmljs: correct slot name for properties starting with “_”Fawzi Mohamed2014-05-151-2/+9
| | | | | | Task-number: QTCREATORBUG-12214 Change-Id: Ie8009846ce27d4acbc3e9ad4dd7dda73fde39413 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qmljs: improve qmltype parsing error messagesFawzi Mohamed2014-02-181-1/+1
| | | | | | | | add filename to each error message. Change-Id: I2b9f550147acfe6993f1e7d878fdda863182a2a0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@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: simple tracking of used modulesFawzi Mohamed2013-10-231-1/+8
| | | | | Change-Id: Idc977a8c5a6c6caa3749599cb6f4a236046f53d7 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* qmljs: added qmljsconstants.hFawzi Mohamed2013-10-231-17/+17
| | | | | | | | | | | | | | 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>
* Doc: edit qmljs docsLeena Miettinen2013-09-231-2/+3
| | | | | | | | Use standard wording, fix capitalization, typos, and style and grammar issues. Change-Id: Iac3faa59ef32aa2a8ec1857aed0d861701cbfbe7 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Doc: use standard wording in \brief commandsLeena Miettinen2013-06-201-1/+2
| | | | | | | | | 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: adding qrc supportFawzi Mohamed2013-06-031-10/+17
| | | | | | | | | | | | | | | | | | | | | 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>
* TypeDescriptionReader: Check for files that are not UTF8 encodedThomas Hartmann2013-05-151-5/+20
| | | | | | | | 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>
* Clean headers in QmlJs.Friedemann Kleint2013-04-041-9/+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>
* Doc: replace deprecated QDoc commandsLeena Miettinen2013-02-061-4/+4
| | | | | | | | | | The \i and \o commands were replaced with \li and \bold was replaced with \b in QDoc for Qt 5. The \input command was replaced with \include in the docs. Change-Id: I257d1bebb8ebc739ca20e0d29fcf0406ecb14534 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-28/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | QmlJS: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-11-281-6/+10
| | | | | | | | | | | | Change-Id: I0c5654a978f47a4db5428936fd44633f21394830 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-051-21/+20
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessageloghandler.h src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/madde/maemodeployconfigurationwidget.h src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentinfo.h src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/ichecklib_global.h tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h tests/manual/ssh/tunnel/tunnel.h Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
| * Adjust license headershjk2012-10-051-21/+20
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | QmljsInterpreter: avoid ambiguities about major import versionThomas Hartmann2012-09-261-4/+8
|/ | | | | | | | | | | Both CppComponentValues are created and available in the code model. In case of a context lookup it seems to be random which one is taken. This patch ensures that the code model only contains the object with the highest version. Change-Id: Icd1ac1c7d62e277bbd8a2747c3504457be5dd8d6 Reviewed-by: Christian Kamm <kamm@incasoftware.de>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QmlJSInterpreter: QML Plugin typesAurindam Jana2012-05-071-35/+26
| | | | | | | | | | A Component in .qmltypes can have an array of exports which may differ in type names and versions. Consider the type names to be aliases and create a CppComponentValue for each of the alias corresponding to the best available version. Change-Id: I759ae0c68441e805b0502bf2d203c524bf1a7a7c Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* QmlJSInterpreter: Register QML TypesAurindam Jana2012-04-301-4/+20
| | | | | | | | | | | A Component in .qmltypes can have an array of exports which may differ in type names too (possibly because of type deprecation). Consider the type names to be aliases and create a CppComponentValue for each of the alias. Change-Id: I70cadab465aec3e7842abd7050549c77fb8342fc Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* QmlJS: Actually print warning for .qmltypes fileKai Koehne2012-03-131-1/+1
| | | | | Change-Id: I93030362168719c126818006839e9fae0ca673ce Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-9/+9
| | | | | | | | 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>
* Qt Creator: Compile with Qt 5.Friedemann Kleint2011-12-121-0/+21
| | | | | | | | Introduce #ifdefs for incompatible changes in QAtomicPointer and QAtomicInt. Change-Id: Ice03a2cc8b3aed174e549827cfcf737764c41642 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QmlJS: Fix highlighting and completion for property declarations.Christian Kamm2011-12-071-1/+13
| | | | | | | | | | | | | When property declarations use a custom type such as property Foo bar we now * highlight Foo as a QML type if it's found * complete bar. as a Foo Change-Id: I82c249646af19bfeb9f5a7a7692f0dc10b009835 Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
View Lorry Controller Status