feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.4'

Browse Source
This commit is contained in:
Eike Ziller
2015-03-24 07:40:21 +01:00
parent 674b798350 044eeacde5
commit 9790d8aa00
103 changed files with 1018 additions and 1167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprofiler/qml/bindingloops.frag
View File

@@ -28,7 +28,7 @@
**
****************************************************************************/
vec4 orange = vec4(1.0, 165.0 / 255.0, 0.0, 1.0);
lowp vec4 orange = vec4(1.0, 165.0 / 255.0, 0.0, 1.0);
void main()
{
gl_FragColor = orange;

23
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
View File

@@ -76,7 +76,6 @@ public:
QmlProfilerTraceViewPrivate(QmlProfilerTraceView *qq) : q(qq) {}
QmlProfilerTraceView *q;
QmlProfilerStateManager *m_profilerState;
QmlProfilerTool *m_profilerTool;
QmlProfilerViewManager *m_viewContainer;
@@ -90,7 +89,7 @@ public:
Timeline::TimelineZoomControl *m_zoomControl;
};
QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerTool *profilerTool, QmlProfilerViewManager *container, QmlProfilerModelManager *modelManager, QmlProfilerStateManager *profilerState)
QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerTool *profilerTool, QmlProfilerViewManager *container, QmlProfilerModelManager *modelManager)
: QWidget(parent), d(new QmlProfilerTraceViewPrivate(this))
{
setObjectName(QLatin1String("QML Profiler"));
@@ -141,9 +140,6 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerTool *pro
// Connect this last so that it's executed after the models have updated their data.
connect(modelManager->qmlModel(), SIGNAL(changed()), d->m_modelProxy, SIGNAL(stateChanged()));
connect(d->m_modelManager, SIGNAL(stateChanged()), this, SLOT(profilerDataModelStateChanged()));
d->m_profilerState = profilerState;
// Minimum height: 5 rows of 20 pixels + scrollbar of 50 pixels + 20 pixels margin
setMinimumHeight(170);
@@ -308,23 +304,6 @@ void QmlProfilerTraceView::showContextMenu(QPoint position)
}
////////////////////////////////////////////////////////////////
// Profiler State
void QmlProfilerTraceView::profilerDataModelStateChanged()
{
switch (d->m_modelManager->state()) {
case QmlProfilerDataState::Empty: break;
case QmlProfilerDataState::ClearingData:
d->m_mainView->hide();
break;
case QmlProfilerDataState::AcquiringData: break;
case QmlProfilerDataState::ProcessingData: break;
case QmlProfilerDataState::Done:
d->m_mainView->show();
break;
default:
break;
}
}
void QmlProfilerTraceView::changeEvent(QEvent *e)
{

4
src/plugins/qmlprofiler/qmlprofilertraceview.h
View File

@@ -51,8 +51,7 @@ class QmlProfilerTraceView : public QWidget
public:
explicit QmlProfilerTraceView(QWidget *parent, QmlProfilerTool *profilerTool,
QmlProfilerViewManager *container,
QmlProfilerModelManager *modelManager,
QmlProfilerStateManager *profilerState);
QmlProfilerModelManager *modelManager);
~QmlProfilerTraceView();
bool hasValidSelection() const;
@@ -68,7 +67,6 @@ public slots:
private slots:
void updateCursorPosition();
void profilerDataModelStateChanged();
protected:
void changeEvent(QEvent *e) Q_DECL_OVERRIDE;

3
src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp
View File

@@ -95,8 +95,7 @@ void QmlProfilerViewManager::createViews()
d->traceView = new QmlProfilerTraceView(mw,
d->profilerTool,
this,
d->profilerModelManager,
d->profilerState);
d->profilerModelManager);
d->traceView->setWindowTitle(tr("Timeline"));
connect(d->traceView, SIGNAL(gotoSourceLocation(QString,int,int)),
this, SIGNAL(gotoSourceLocation(QString,int,int)));