feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
88897f3a870de7b756356907801f09a90902e490
qt-creator/src/plugins/qmljseditor
History
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
..
qmlexpressionundercursor.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
qmlexpressionundercursor.h
Wholesale conversion to #pragma once
2016-03-30 15:20:19 +00:00
qmljsautocompleter.cpp
Editor: Skip auto completed character only if it was recently inserted.
2016-06-21 11:56:56 +00:00
qmljsautocompleter.h
Editor: Skip auto completed character only if it was recently inserted.
2016-06-21 11:56:56 +00:00
qmljscompletionassist.cpp
QmlJS: improve static initializings
2016-09-21 12:05:23 +00:00
qmljscompletionassist.h
QmlJSEditor: Expose helper function for auto completion
2016-09-05 12:21:45 +00:00
qmljscomponentfromobjectdef.cpp
TextEditor: Remove exported class QuickFixOperations
2016-11-18 11:47:59 +00:00
qmljscomponentfromobjectdef.h
QmlJSEditor: Export ComponentFromObjectDef
2016-05-02 07:42:02 +00:00
qmljscomponentnamedialog.cpp
QmlDesigner: Allow .ui.qml file in component creation
2016-10-04 08:59:13 +00:00
qmljscomponentnamedialog.h
QmlDesigner: Allow .ui.qml file in component creation
2016-10-04 08:59:13 +00:00
qmljscomponentnamedialog.ui
QmlDesigner: Allow .ui.qml file in component creation
2016-10-04 08:59:13 +00:00
qmljseditingsettingspage.cpp
QmlJSEditor: Add option to automatically format QML/JS file on save
2016-11-02 19:38:38 +00:00
qmljseditingsettingspage.h
QmlJSEditor: Add option to automatically format QML/JS file on save
2016-11-02 19:38:38 +00:00
qmljseditingsettingspage.ui
QmlJSEditor: Add option to automatically format QML/JS file on save
2016-11-02 19:38:38 +00:00
qmljseditor_dependencies.pri
Remove aggregation dependency from project files
2015-03-09 14:25:34 +00:00
qmljseditor_global.h
Wholesale conversion to #pragma once
2016-03-30 15:20:19 +00:00
qmljseditor.cpp
QmlJSEditor: avoid jumping cursor while editing
2017-04-07 10:21:46 +00:00
qmljseditor.h
QmlJSEditor: avoid jumping cursor while editing
2017-04-07 10:21:46 +00:00
QmlJSEditor.json.in
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
qmljseditor.pro
QmlJSEditor: Add option to automatically format QML/JS file on save
2016-11-02 19:38:38 +00:00
qmljseditor.qbs
QmlJSEditor: Add option to automatically format QML/JS file on save
2016-11-02 19:38:38 +00:00
qmljseditorconstants.h
Prefix editor's uniqueId with plugin name
2017-01-10 15:14:19 +00:00
qmljseditordocument_p.h
QmlJSEditor: use direct member initialization
2017-04-03 12:28:49 +00:00
qmljseditordocument.cpp
QmlJSEditor: use direct member initialization
2017-04-03 12:28:49 +00:00
qmljseditordocument.h
CodeAssist: Support only one quickfix assistant per editor class.
2016-04-28 12:14:41 +00:00
qmljseditorplugin.cpp
QmlJSEditor: Add option to automatically format QML/JS file on save
2016-11-02 19:38:38 +00:00
qmljseditorplugin.h
QmlJSEditor: Add option to automatically format QML/JS file on save
2016-11-02 19:38:38 +00:00
qmljsfindreferences.cpp
QmlJs: sync qmljs parser
2017-03-23 07:50:26 +00:00
qmljsfindreferences.h
QmlJS[|Editor|Tools]: Use Qt5-style connects
2016-06-28 08:47:26 +00:00
qmljshighlighter.cpp
improve static initializers
2016-09-23 14:27:01 +00:00
qmljshighlighter.h
Wholesale conversion to #pragma once
2016-03-30 15:20:19 +00:00
qmljshoverhandler.cpp
QmlJs: disambiguate help lookup
2016-12-07 10:50:07 +00:00
qmljshoverhandler.h
BaseHoverHandler: Remove virtual and add override to derivations
2016-08-10 11:04:18 +00:00
qmljsoutline.cpp
QmlDesigner: Fix Crash
2017-04-11 12:44:55 +00:00
qmljsoutline.h
QmlJSEditor: remove modeUpdated method
2017-04-07 10:20:52 +00:00
qmljsoutlinetreeview.cpp
QmlJSEditor: Minor cleanup
2016-06-29 09:05:28 +00:00
qmljsoutlinetreeview.h
QmlJS[|Editor|Tools]: Use Qt5-style connects
2016-06-28 08:47:26 +00:00
qmljspreviewrunner.cpp
ProjectExplorer: Use StandardRunnable in ApplicationLauncher
2016-01-28 11:35:51 +00:00
qmljspreviewrunner.h
Wholesale conversion to #pragma once
2016-03-30 15:20:19 +00:00
qmljsquickfix.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
qmljsquickfix.h
Wholesale conversion to #pragma once
2016-03-30 15:20:19 +00:00
qmljsquickfixassist.cpp
CodeAssist: Support only one quickfix assistant per editor class.
2016-04-28 12:14:41 +00:00
qmljsquickfixassist.h
CodeAssist: Support only one quickfix assistant per editor class.
2016-04-28 12:14:41 +00:00
qmljsquickfixes.cpp
TextEditor: Remove exported class QuickFixOperations
2016-11-18 11:47:59 +00:00
qmljsreuse.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
qmljsreuse.h
Wholesale conversion to #pragma once
2016-03-30 15:20:19 +00:00
qmljssemantichighlighter.cpp
Merge remote-tracking branch 'origin/4.3'
2017-04-19 09:56:14 +02:00
qmljssemantichighlighter.h
QmlJS[|Editor|Tools]: Use Qt5-style connects
2016-06-28 08:47:26 +00:00
qmljssemanticinfoupdater.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
qmljssemanticinfoupdater.h
QmlJS[|Editor|Tools]: Use Qt5-style connects
2016-06-28 08:47:26 +00:00
qmljssnippetprovider.cpp
ISnippetProvider: Code polish
2016-08-22 11:36:28 +00:00
qmljssnippetprovider.h
ISnippetProvider: Code polish
2016-08-22 11:36:28 +00:00
qmljswrapinloader.cpp
TextEditor: Remove exported class QuickFixOperations
2016-11-18 11:47:59 +00:00
qmljswrapinloader.h
Wholesale conversion to #pragma once
2016-03-30 15:20:19 +00:00
qmloutlinemodel.cpp
Add support for new javascript methods to QML/JS outline
2016-05-20 10:07:58 +00:00
qmloutlinemodel.h
Add support for new javascript methods to QML/JS outline
2016-05-20 10:07:58 +00:00
qmltaskmanager.cpp
QmlJS[|Editor|Tools]: Use Qt5-style connects
2016-06-28 08:47:26 +00:00
qmltaskmanager.h
QmlJS[|Editor|Tools]: Use Qt5-style connects
2016-06-28 08:47:26 +00:00
quicktoolbar.cpp
QmlJSEditor: Add option to automatically format QML/JS file on save
2016-11-02 19:38:38 +00:00
quicktoolbar.h
QmlJS[|Editor|Tools]: Use Qt5-style connects
2016-06-28 08:47:26 +00:00