feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
72,662 Commits 108 Branches 368 Tags
d3dae6b7ddbc1edc15e30b2ac5cd8625d0f333f5
Commit Graph

247 Commits

Author SHA1 Message Date
Marco Benelli
4646acad0d qmljs: update parser 
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>
 2018-11-22 11:21:32 +00:00
Alessandro Portale
4b13170565 qmljs: Use C++11’s override and remove virtual where applicable 
Fixes warning: prefer using 'override' or (rarely) 'final' instead of
'virtual' [modernize-use-override]

Change-Id: I17955fd0fdb052678228f1bda32cd8d3b4298998
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
 2018-06-26 10:38:38 +00:00
Marco Benelli
b9d72a5737 qmljs: remove remaining references to QtQuick1 
This patch removes all references to QtQuick1 in qml library,
plugin, designer, profiler and tests.

Change-Id: Ie286fad96060299caae3ef328330597cf53e90d3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
 2018-04-03 14:40:30 +00:00
Thomas Hartmann
3b1e0e070a QmlJS: Allow NumberAnimation for ui.qml files 
Change-Id: I12836a2d7708d50278715139f0cfba5fa221f8eb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2018-03-07 14:13:08 +00:00
Marco Benelli
2acb365dac qmljs: relax checks for qbs files 
Types information for qbs is more limited that qml; this causes
qtcreator to raise false positives.  This patch relax the checks and
provide some type information needed by qbs files generated by the
wizards.

Task-number: QTCREATORBUG-19757
Change-Id: I07a1dd9d8fedaf4c5c751c2f00643f15ae39127a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2018-02-27 15:17:44 +00:00
Thomas Hartmann
6a738504d0 QmlJS: Add error message for dynamic property called "data" 
The default property of most QtQuick items is data and
therefore "data" should not be used as a property name.

Task-number: QTCREATORBUG-19225
Change-Id: I54d1b72ce984debd4c366b7261e93b7a81b8c940
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
 2017-11-06 16:41:07 +00:00
Marco Benelli
65b2edbd82 qmljs: better handling of attached properties 
Attached properties used to cause false positives in the highlighter,
because when using qualified ids, only the first part was checked as
candidate for being at attached property.

Task-number: QTCREATORBUG-18707
Change-Id: I6b1b569bc1766325decbc5d100c16a4e0dc3634f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2017-09-19 08:04:36 +00:00
Eike Ziller
d8fd5292f1 Merge remote-tracking branch 'origin/4.4' 
Conflicts:
	src/tools/clangbackend/ipcsource/clangiasyncjob.cpp
	src/tools/clangbackend/ipcsource/clangjobrequest.cpp
	src/tools/clangbackend/ipcsource/clangjobrequest.h

Change-Id: Ib8602530663813ade418f995dfd2a736908cfe75
 2017-08-15 10:07:51 +02:00
Robert Loehning
74d14d0092 QmlJs: Initialize members 
Change-Id: I15a3ec660608266595a8b7a12b59016cc28331af
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2017-08-11 10:34:00 +00:00
Marco Benelli
73834060d7 QmlJs: fix false positives for properties 
Resolve references while looking up for object members.

Task-number: QTCREATORBUG-18362
Change-Id: I9d2b2457fb3488c723a41e4e8ba1fc0ea9fe800f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2017-08-10 08:08:38 +00:00
Orgad Shaneh
8430da3bf7 Merge remote-tracking branch 'origin/4.3' into master 
Change-Id: I01ab8c85ea3372b6dce4142ddb9cf92d903ffca6
 2017-05-23 23:41:40 +03:00
Thomas Hartmann
c515f68786 QmlJS: Allow Loaders in ui.qml files 
Loader are working in the designer and we will add more support for
them in the future.

Change-Id: Ied62d65b0eb9933b44a7833ccafcb934d4ae6fba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-05-22 14:19:02 +00:00
Tim Jenssen
19239e3770 QmlJs: use initilizer_lists for pairs 
Change-Id: I0386d57ad3549814ab197c4e24549705e061c95a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2017-04-27 07:45:06 +00:00
Eike Ziller
88897f3a87 Merge remote-tracking branch 'origin/4.3' 
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/genericprojectmanager/genericprojectnodes.cpp
	src/plugins/genericprojectmanager/genericprojectnodes.h

Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
 2017-04-19 09:56:14 +02:00
Montel Laurent
5d27bc747b Use QFileInfo::exists(...) which is faster that QFileInfo(..).exists 
Change-Id: I0d2e61d84c74e60ef4f54074a4ca00f2d0835562
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-04-14 13:18:28 +00:00
Thomas Hartmann
9089fbdfc5 QmlDesigner: Allow Dialog in .ui.qml files 
The support is not perfect, but I see no reason to
excplitly not allow it.

Change-Id: I6b1d825acde156cc7b50160060e89bb964667ab8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-03-31 08:56:18 +00:00
Marco Benelli
61d30a20ce QmlJs: sync qmljs parser 
The last version of the grammar contains some constructs that the code model
needs to know.

Task-number: QTCREATORBUG-17842
Change-Id: I6250f96431acc05b19f3fd1b6cc268a07485cf0f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-03-23 07:50:26 +00:00
Orgad Shaneh
da7cb91446 Merge remote-tracking branch 'origin/4.2' into 4.3 
Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
 2017-03-14 16:20:14 +02:00
Samuel Gaist
4033471aa9 QRegExp include cleanup 
This patch adds the missing include statements for QRegExp.

Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-03-13 22:05:30 +00:00
Tim Jenssen
2631ffabd5 Remove spaces in initializer lists 
Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
 2017-02-22 16:25:09 +00:00
Thomas Hartmann
fb14b4a6c8 QmlDesigner: Allow qsTranslate in .ui.qml files 
Also adding the NoOp functions. They can be used in models.

Task-number: QTCREATORBUG-17714
Change-Id: Ide9745613850580f0098d2fa7f8889809d18bd45
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2017-02-13 16:01:11 +00:00
Thomas Hartmann
6890e4e131 QmlJSCheck: Allow Math. function in ui.qml files 
The Math. function like Math.max() are quite useful
to define more complex layouts. Therefore we allow them.

Change-Id: Ia95dcbcc1b8e96c117650dc8643da4a9de0ecdba
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
 2016-11-17 10:34:56 +00:00
Dmitry V. Tchoomak
10954e07a5 QMlJSCheck: Add missed types of State changes 
Change-Id: I08ed689dfa92477e35961b7b0b1d407f0c974979
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-11-09 08:19:43 +00:00
Thomas Hartmann
062512a246 QmlJSCheck: Adding more unsupported in designer types 
Using initializer lists looks much better.

Change-Id: I314d846a9d383dbda432cd67010d79b492f40915
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-11-08 16:14:18 +00:00
Thomas Hartmann
2cab55ea1a QmlDesigner: Allow JavaScrip blocks in Connections in .ui.qml 
Inside a Connections item JavaScript blocks should be allowed.

Change-Id: Ia6a08fc575a72980bd53a32249bf302b7a426266
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
 2016-10-28 14:27:58 +00:00
Thomas Hartmann
99aaf86a33 QmlJSCheck: Add error for ambiguous ids 
Certain ids can be ambiguous and have name clashes with properties.
Those ids are not supported in the designer.

Change-Id: Ida293d24611c467df6ef813a541e8abfc06b51cb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2016-10-26 16:08:29 +00:00
Thomas Hartmann
0db6f2a372 QmlDesigner: A StateChangeScript can be the child of a State 
I found this while testing our demos.

Change-Id: I575e1d2f487a2ba137ac8181f4980c30b171f726
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2016-07-01 15:29:32 +00:00
Thomas Hartmann
0a3f596599 QmlDesigner: Fix regression caused by semantic check 
States can of course contain PropertyChanges.

Change-Id: Ie78be1db58c6820a49356b1cd70102e10211030b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-06-28 11:49:16 +00:00
Thomas Hartmann
add3828389 QmlJSEditor: Do not allow child items for states 
Task-number: QTCREATORBUG-13003
Change-Id: I30bcee12803d2b3af804625ffdf417316e3d6c32
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-06-22 15:52:56 +00:00
Ulf Hermann
e49b0670c8 QmlJS: Don't crash if the type stack is empty 
Change-Id: If4e0155e8167f3edee1890dee5fd8b19623bba17
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-05-31 08:11:25 +00:00
Tim Jenssen
3c2dc15f6d QmlDesigner: allow adding connections in ui.qml files 
Change-Id: Ia4d9f01f41ca2bca1eca0df3cf121ae2800e31d4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2016-05-27 12:15:46 +00:00
Thomas Hartmann
354abe5ad8 QmlJS: Fix possible crash 
For a valid AST id should be never empty.
A crash has been reported. though. Most likely the parser
injected a UiQualifiedId for an incomplete document.

Change-Id: Id2f1b25cf9d78982524d7aaff2b43210e1ae2a3b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
 2016-04-13 13:13:45 +00:00
Tobias Hunger
f72370f20a Update License according to agreement with Free Qt Foundation 
* Update remaining files in src

Change-Id: I1896f17fcf34f71c3310c87899fb5171b8e4afb1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:59:41 +00:00
Takumi ASAKI
44bb3cb4c3 QmlDesigner: Adding qsTrId() support 
Task-number: QTBUG-48850
Change-Id: I16a0612ec29b552a3d46f2563fdc2a043b9dec7e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
 2015-12-15 00:34:57 +00:00
Friedemann Kleint
1b9be30371 Clean headers in lib qmljs and plugins qmljstools, qmljseditor. 
Change-Id: I3256db8f4d42b6326d986d754b45e6c6c2030839
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-05 08:17:10 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Fawzi Mohamed
6fed775226 qmljs: do not warn for QT_TR* functions 
Change-Id: If5cf78434458ae639b4ebd0cb156110b5a291613
Task-number: QTCREATORBUG-12494
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-11-06 11:40:19 +01:00
Thomas Hartmann
7956107187 QmlJS: Distinguish between erros for ui.qml files and designer warnings 
We properly distinguish between warnings in the Qt Quick Designer and
error in a .ui.qml file.

The warnings are a subset of the errors anyway.

Change-Id: Ib3b21a845436381df10863b464c975b0b39fc063
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-10-15 12:37:28 +02:00
Thomas Hartmann
11b30a22ed QmlJS:: Allow qsTr() for .ui.qml files 
Change-Id: I8ccae13653bbb010853d99be9136bf364b823c3d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-10-15 09:24:01 +02:00
Thomas Hartmann
033b711dc7 QmlJS: Adding checks for .ui.qml files 
Change-Id: I88eab65e1c1187ffd5a88fb5c9780d0156a17729
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-10-15 09:23:41 +02:00
Eike Ziller
020c86038c Merge "Merge remote-tracking branch 'origin/3.2'" 2014-10-14 16:28:45 +02:00
Thomas Hartmann
93c3ee1bbf QmlJSEditor: warn when editing .ui.qml, activate designer checks 
Change-Id: I2f6d39633341bd1197d16c5c097573d4ab090896
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-14 15:38:50 +02:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
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
 2014-10-14 15:36:16 +02:00
Fawzi Mohamed
419d4e4411 Add ui.qml support to code mode and editor 
Change-Id: I6d818ddad1e7467578c63161c278455ef6ac743e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-10-14 14:46:32 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Thomas Hartmann
95182687f8 QmlJS: Add error message for invalid root item in the designer 
Documents with those types do crash the qmlpuppet and confuse the users.
With this patch we give a clear error message and such files are not supported
anymore.

Change-Id: Iba19def2751d4dc81d90684c0c63c0274fdf49cf
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-09-10 15:03:22 +02:00
Kai Koehne
8f2532d333 QmlJS: Don't use QDir::separator() for internal paths 
We use forward slashes in all internal paths, even on Windows.

Change-Id: Ie0b418c770dad96829dd357fe425616b6d3a5b82
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-09-03 09:41:27 +02:00
Fawzi Mohamed
4dc438db5e qmljs: switch to the new category logging 
Change-Id: Id4e43779590939e9d6dd2d0dab536f70e721f097
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-07-01 11:31:12 +02:00
Kai Koehne
231c46d102 Fix 'prefered' typo in variable names 
Change-Id: I15d65d4bb5a29b546b7a781051c3d641764d527e
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-03-19 11:14:37 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00