diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:11:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-06-29 10:11:25 +0200 |
| commit | 5f2249f4dcce7523d8dc88b425b43834c4c3cab9 (patch) | |
| tree | 5ddbd03806a0f940cca2d4de966c2a00d761717b /src/quick/scenegraph/qsgcontext.cpp | |
| parent | d5cb1bf4a9e19a0a4471ba5c935f441463a73414 (diff) | |
| parent | 1b897195a14b63a553b139983736d8dfdd419ffd (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I70c0c672708522f7157849365cc53ee271d8e460
Diffstat (limited to 'src/quick/scenegraph/qsgcontext.cpp')
| -rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 6572ceb2ce..25945ad78a 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -92,7 +92,7 @@ QT_BEGIN_NAMESPACE // Used for very high-level info about the renderering and gl context // Includes GL_VERSION, type of render loop, atlas size, etc. -Q_LOGGING_CATEGORY(QSG_LOG_INFO, "qt.scenegraph.info") +Q_LOGGING_CATEGORY(QSG_LOG_INFO, "qt.scenegraph.general") // Used to debug the renderloop logic. Primarily useful for platform integrators // and when investigating the render loop logic. |