Eike Ziller e56118cc1e Merge remote-tracking branch 'origin/3.4' ...

Conflicts:
	src/libs/extensionsystem/pluginview.cpp

Change-Id: I316199fe0a257cb085668ccb183b1590555278f2

2015-04-02 11:56:55 +02:00

..

qml

Fix timeline shaders for OpenGL ES

2015-03-19 15:24:05 +00:00

abstractqmlprofilerrunner.h

Update License

2015-01-16 12:37:56 +01:00

localqmlprofilerrunner.cpp

QmlDesigner: Remove unneeded qualifications

2015-02-18 09:53:25 +00:00

localqmlprofilerrunner.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofiler_dependencies.pri

Remove aggregation dependency from project files

2015-03-09 14:25:34 +00:00

qmlprofiler_global.h

Update License

2015-01-16 12:37:56 +01:00

QmlProfiler.json.in

Update License

2015-01-16 12:37:56 +01:00

qmlprofiler.pro

QmlProfiler: use QQuickWidget instead of window container

2015-02-16 10:52:00 +00:00

qmlprofiler.qbs

Remove aggregation dependency from project files

2015-03-09 14:25:34 +00:00

qmlprofileranimationsmodel.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

qmlprofileranimationsmodel.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

qmlprofilerattachdialog.cpp

QmlDesigner: Remove unneeded qualifications

2015-02-18 09:53:25 +00:00

qmlprofilerattachdialog.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerattachdialog.ui

QmlProfiler: Add "Sysroot" field to attach dialog

2011-10-17 15:05:02 +02:00

qmlprofilerbasemodel_p.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerbasemodel.cpp

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerbasemodel.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerbindingloopsrenderpass.cpp

QmlProfiler: Fix compiler warnings on release build

2015-01-12 15:13:41 +01:00

qmlprofilerbindingloopsrenderpass.h

Timeline: Create new library from contents of QmlProfiler

2014-12-16 15:22:48 +01:00

qmlprofilerclientmanager.cpp

QmlDesigner: Remove unneeded qualifications

2015-02-18 09:53:25 +00:00

qmlprofilerclientmanager.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerconstants.h

QmlProfiler: fix progress bar visibilty for loading traces

2015-02-26 16:19:27 +00:00

qmlprofilerdatamodel.cpp

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

qmlprofilerdatamodel.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

qmlprofilerdetailsrewriter.cpp

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerdetailsrewriter.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerengine.cpp

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerengine.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilereventsmodelproxy.cpp

Don't mix iterator and const_iterator

2015-04-02 09:40:24 +00:00

qmlprofilereventsmodelproxy.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

qmlprofilereventview.cpp

QmlDesigner: Remove unneeded qualifications

2015-02-18 09:53:25 +00:00

qmlprofilereventview.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilermodelmanager.cpp

QmlProfiler: fix progress bar visibilty for loading traces

2015-02-26 16:19:27 +00:00

qmlprofilermodelmanager.h

QmlProfiler: fix progress bar visibilty for loading traces

2015-02-26 16:19:27 +00:00

qmlprofilernotesmodel.cpp

Timeline: Create new library from contents of QmlProfiler

2014-12-16 15:22:48 +01:00

qmlprofilernotesmodel.h

Timeline: Create new library from contents of QmlProfiler

2014-12-16 15:22:48 +01:00

qmlprofilerplugin.cpp

Analyzer: Reduce explicit use of StartMode enum

2015-02-20 09:35:24 +00:00

qmlprofilerplugin.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

qmlprofilerrangemodel.cpp

Timeline: Create new library from contents of QmlProfiler

2014-12-16 15:22:48 +01:00

qmlprofilerrangemodel.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

qmlprofilerruncontrolfactory.cpp

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerruncontrolfactory.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerstatemanager.cpp

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerstatemanager.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerstatewidget.cpp

QmlProfiler: Don't re-estimate profiling time when not profiling

2015-02-25 16:58:54 +00:00

qmlprofilerstatewidget.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilertimelinemodel.cpp

QmlProfiler: Make TimelineModel usable from QML

2014-11-27 16:09:34 +01:00

qmlprofilertimelinemodel.h

Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'

2015-02-12 17:29:21 +01:00

qmlprofilertimelinemodelfactory.cpp

QmlProfiler: Require model manager when constructing timeline models

2014-11-21 10:54:29 +01:00

qmlprofilertimelinemodelfactory.h

QmlProfiler: Split AbstractTimelineModel in two classes

2014-11-21 14:03:58 +01:00

qmlprofilertool.cpp

Merge remote-tracking branch 'origin/3.4'

2015-03-02 12:11:37 +01:00

qmlprofilertool.h

QmlProfiler: fix progress bar visibilty for loading traces

2015-02-26 16:19:27 +00:00

qmlprofilertracefile.cpp

QmlProfiler: fix progress bar visibilty for loading traces

2015-02-26 16:19:27 +00:00

qmlprofilertracefile.h

QmlProfiler: fix progress bar visibilty for loading traces

2015-02-26 16:19:27 +00:00

qmlprofilertraceview.cpp

Merge remote-tracking branch 'origin/3.4'

2015-03-26 12:51:06 +01:00

qmlprofilertraceview.h

Merge remote-tracking branch 'origin/3.4'

2015-03-24 07:40:21 +01:00

qmlprofilertreeview.cpp

Update License

2015-01-16 12:37:56 +01:00

qmlprofilertreeview.h

Update License

2015-01-16 12:37:56 +01:00

qmlprofilerviewmanager.cpp

QmlProfiler: Don't hide/show trace view when loading and saving

2015-03-23 09:41:55 +00:00

qmlprofilerviewmanager.h

Update License

2015-01-16 12:37:56 +01:00

qv8profilerdatamodel.cpp

QmlProfiler: fix progress bar visibilty for loading traces

2015-02-26 16:19:27 +00:00

qv8profilerdatamodel.h

QmlProfiler: fix progress bar visibilty for loading traces

2015-02-26 16:19:27 +00:00

qv8profilereventview.cpp

Analyzer: Dissolve IAnalyzerTool

2015-02-18 14:52:07 +00:00

qv8profilereventview.h

Analyzer: Dissolve IAnalyzerTool

2015-02-18 14:52:07 +00:00