diff options
author | Kai Koehne <kai.koehne@qt.io> | 2016-06-21 09:45:06 +0200 |
---|---|---|
committer | Kai Koehne <kai.koehne@qt.io> | 2016-06-23 09:08:59 +0000 |
commit | 6c16a50a51c1bafad71ab48c19ce98d57c005d25 (patch) | |
tree | be20170bd52d4e20eb9874efb8efd34cfdab58fb /src | |
parent | fb15206453faa8db26feb197dac3d16a8d6dfa1b (diff) |
Rename qt.scenegraph.info to qt.scenegraph.general
If configured with logging rules (QT_LOGGING_RULES=),
qt.scenegraph.info=true
will be interpreted as enabling QtInfoMsg for the qt.scenegraph
category and subcategories.
[ChangeLog][QtQuick] qt.scenegraph.info logging category
got renamed to qt.scenegraph.general.
Task-number: QTBUG-54238
Change-Id: I7601e522697c3b4b00b6e9866b803d91f72e76fc
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc | 4 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc index 516630d034..caedd72dc5 100644 --- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc +++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc @@ -180,7 +180,7 @@ dedicated thread. Qt attempts to choose a suitable loop based on the platform and possibly the graphics drivers in use. When this is not satisfactory, or for testing purposes, the environment variable \c QSG_RENDER_LOOP can be used to force the usage of a given loop. To -verify which render loop is in use, enable the \c qt.scenegraph.info +verify which render loop is in use, enable the \c qt.scenegraph.general \l {QLoggingCategory}{logging category}. \note The \c threaded and \c windows render loops rely on the OpenGL @@ -368,7 +368,7 @@ addition to being helpful to Qt contributors. \li \c {qt.scenegraph.time.glyph} - logs the time spent preparing distance field glyphs -\li \c {qt.scenegraph.info} - logs general information about various parts of the scene graph and the graphics stack +\li \c {qt.scenegraph.general} - logs general information about various parts of the scene graph and the graphics stack \li \c {qt.scenegraph.renderloop} - creates a detailed log of the various stages involved in rendering. This log mode is primarily useful for developers working on Qt. diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index dd6977e42e..be228e87c7 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -86,7 +86,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. |