diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-08 19:26:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-08 19:26:48 +0100 |
| commit | ff18885e0a7f7527eb96a9f2047507e7f418db45 (patch) | |
| tree | 37bd1970c31447c73862b81eae4429c7366ef1c7 /src/quick/scenegraph/util/qsgatlastexture.cpp | |
| parent | 439f31f128e70ecae16544ee7041695c60e0b2d6 (diff) | |
| parent | 40722a7eaf6bb6d77d730dc3f8510718e2cad549 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/quick/scenegraph/util/qsgatlastexture.cpp')
| -rw-r--r-- | src/quick/scenegraph/util/qsgatlastexture.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp index 75bf0b6e3c..389945849f 100644 --- a/src/quick/scenegraph/util/qsgatlastexture.cpp +++ b/src/quick/scenegraph/util/qsgatlastexture.cpp @@ -375,7 +375,7 @@ bool Atlas::bind(QSGTexture::Filtering filtering) #ifndef QSG_NO_RENDER_TIMING if (qsg_render_timing) { - printf(" - AtlasTexture(%dx%d), uploaded in %d ms\n", + qDebug(" - AtlasTexture(%dx%d), uploaded in %d ms", m_pending_uploads.at(i)->image().width(), m_pending_uploads.at(i)->image().height(), (int) (qsg_renderer_timer.elapsed())); |