src/plugins/cppeditor · 7efa115245c75019129a0cb768eb33d29e6bd00f · Marco Bubke / flatpak-qt-creator

Merge remote-tracking branch 'origin/2.4'

Eike Ziller authored 13 years ago

Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7

912cd548

History

912cd548 13 years ago

History

Name	Last commit	Last update
..
images
CppEditor.mimetypes.xml
CppEditor.pluginspec.in
CppEditor.qwp
cppautocompleter.cpp
cppautocompleter.h
cppchecksymbols.cpp
cppchecksymbols.h
cppclasswizard.cpp
cppclasswizard.h
cppcompleteswitch.cpp
cppcompleteswitch.h
cppeditor.cpp
cppeditor.h
cppeditor.pri
cppeditor.pro
cppeditor.qrc
cppeditor_dependencies.pri
cppeditor_global.h
cppeditorconstants.h
cppeditorenums.h
cppelementevaluator.cpp
cppelementevaluator.h
cppfilewizard.cpp
cppfilewizard.h
cppfunctiondecldeflink.cpp
cppfunctiondecldeflink.h
cpphighlighter.cpp
cpphighlighter.h
cpphoverhandler.cpp
cpphoverhandler.h
cppinsertdecldef.cpp
cppinsertdecldef.h
cppinsertqtpropertymembers.cpp
cppinsertqtpropertymembers.h
cpplocalsymbols.cpp
cpplocalsymbols.h
cppoutline.cpp
cppoutline.h
cppplugin.cpp
cppplugin.h
cppquickfix.cpp
cppquickfix.h
cppquickfixassistant.cpp
cppquickfixassistant.h
cppquickfixes.cpp
cppsemanticinfo.cpp
cppsemanticinfo.h
cppsnippetprovider.cpp
cppsnippetprovider.h
cpptypehierarchy.cpp
cpptypehierarchy.h