← Back to branch summary

~ubuntu-branches/ubuntu/wily/qtdeclarative-opensource-src/wily-proposed

« back to all changes in this revision

Viewing changes to src/quick/scenegraph/qsgadaptationlayer.cpp

  • Committer: Package Import Robot
  • Author(s): Ricardo Salveti de Araujo, Ricardo Salveti de Araujo, Timo Jyrinki
  • Date: 2014-06-19 02:39:21 UTC
  • mfrom: (0.1.18 experimental)
  • Revision ID: package-import@ubuntu.com-20140619023921-yb2oasnuetz9b0fc
Tags: 5.3.0-3ubuntu4
[ Ricardo Salveti de Araujo ]
* debian/control:
  - Updating dependencies as we now also have libqt5quickwidgets5-gles
* libqt5quickwidgets5.symbols: updating to allow gles variant

[ Timo Jyrinki ]
* Update libqt5quickparticles5.symbols from build logs

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/quick/scenegraph/qsgadaptationlayer.cpp
48
48
#include <QtGui/qguiapplication.h>
49
49
#include <qdir.h>
50
50
 
51
 
#include <private/qqmlprofilerservice_p.h>
 
51
#include <private/qquickprofiler_p.h>
52
52
#include <QElapsedTimer>
53
53
 
54
54
QT_BEGIN_NAMESPACE
164
164
        return;
165
165
 
166
166
#ifndef QSG_NO_RENDER_TIMING
167
 
    bool profileFrames = qsg_render_timing || QQmlProfilerService::enabled;
 
167
    bool profileFrames = qsg_render_timing || QQuickProfiler::enabled;
168
168
    if (profileFrames)
169
169
        qsg_render_timer.start();
170
170
#endif
196
196
               (int) qsg_render_timer.elapsed());
197
197
 
198
198
    }
199
 
    if (QQmlProfilerService::enabled) {
200
 
        QQmlProfilerService::sceneGraphFrame(
201
 
                    QQmlProfilerService::SceneGraphAdaptationLayerFrame,
202
 
                    count,
203
 
                    renderTime,
204
 
                    qsg_render_timer.nsecsElapsed() - renderTime);
205
 
    }
 
199
    Q_QUICK_SG_PROFILE1(QQuickProfiler::SceneGraphAdaptationLayerFrame, (
 
200
            count,
 
201
            renderTime,
 
202
            qsg_render_timer.nsecsElapsed() - renderTime));
206
203
#endif
207
204
}
208
205