src/plugins/qmlprofiler · 2678662fb492d1cf5340894a6f7112fbd2e2c6a8 · Marco Bubke / flatpak-qt-creator

Merge remote-tracking branch 'origin/3.0'

Eike Ziller authored 11 years ago

Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352

851f255b

History

851f255b 11 years ago

History

Name	Last commit	Last update
..
qml
QmlProfiler.pluginspec.in
abstractqmlprofilerrunner.h
abstracttimelinemodel.cpp
abstracttimelinemodel.h
localqmlprofilerrunner.cpp
localqmlprofilerrunner.h
qmlprofiler.pro
qmlprofiler.qbs
qmlprofiler_dependencies.pri
qmlprofiler_global.h
qmlprofilerattachdialog.cpp
qmlprofilerattachdialog.h
qmlprofilerattachdialog.ui
qmlprofilerclientmanager.cpp
qmlprofilerclientmanager.h
qmlprofilerconstants.h
qmlprofilerdetailsrewriter.cpp
qmlprofilerdetailsrewriter.h
qmlprofilerengine.cpp
qmlprofilerengine.h
qmlprofilereventsmodelproxy.cpp
qmlprofilereventsmodelproxy.h
qmlprofilereventview.cpp
qmlprofilereventview.h
qmlprofilermodelmanager.cpp
qmlprofilermodelmanager.h
qmlprofilerpainteventsmodelproxy.cpp
qmlprofilerpainteventsmodelproxy.h
qmlprofilerplugin.cpp
qmlprofilerplugin.h
qmlprofilerprocessedmodel.cpp
qmlprofilerprocessedmodel.h
qmlprofilerruncontrolfactory.cpp
qmlprofilerruncontrolfactory.h
qmlprofilersimplemodel.cpp
qmlprofilersimplemodel.h
qmlprofilerstatemanager.cpp
qmlprofilerstatemanager.h
qmlprofilerstatewidget.cpp
qmlprofilerstatewidget.h
qmlprofilertimelinemodelproxy.cpp
qmlprofilertimelinemodelproxy.h
qmlprofilertool.cpp
qmlprofilertool.h
qmlprofilertracefile.cpp
qmlprofilertracefile.h
qmlprofilertraceview.cpp
qmlprofilertraceview.h
qmlprofilertreeview.cpp
qmlprofilertreeview.h
qmlprofilerviewmanager.cpp
qmlprofilerviewmanager.h
qv8profilerdatamodel.cpp
qv8profilerdatamodel.h
qv8profilereventview.cpp
qv8profilereventview.h
sortedtimelinemodel.cpp
sortedtimelinemodel.h
timelinemodelaggregator.cpp
timelinemodelaggregator.h
timelinerenderer.cpp
timelinerenderer.h