diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2024-02-13 15:04:20 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2024-02-13 20:47:13 +0000 |
| commit | 7b57ae31f6338fdb3faa7403a1a1f4c7e0f22caa (patch) | |
| tree | d08e53c8576dff700734681ff75f13b0537e2092 | |
| parent | a26aff7afd17b1f7ddda917ad07e1c1a9292ec9d (diff) | |
Avoid automatic creation of performance data related .json filesv13.0.0-beta1
Amends 1a84ae038df0757f44d890ad3d5b2e055d5dda7e which enabled building
the Nanotrace library by default. The part that is used for startup
performance logging is only enabled at runtime with the `-trace` command
line argument, but some logging using the "hr" variant was automatically
created. Disable that part at compile time by default.
Fixes: QTCREATORBUG-30331
Change-Id: I8add207c760bfe2dde52534f55feb7b637ccb600
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
| -rw-r--r-- | src/libs/nanotrace/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/libs/nanotrace/nanotracehr.h | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/libs/nanotrace/CMakeLists.txt b/src/libs/nanotrace/CMakeLists.txt index f2fa830e2d..8652a81798 100644 --- a/src/libs/nanotrace/CMakeLists.txt +++ b/src/libs/nanotrace/CMakeLists.txt @@ -3,7 +3,6 @@ add_qtc_library(Nanotrace SOURCES nanotraceglobals.h nanotrace.cpp nanotrace.h - nanotracehr.cpp nanotracehr.h PUBLIC_DEPENDS Qt::Core Qt::Gui PROPERTIES CXX_VISIBILITY_PRESET default @@ -16,3 +15,9 @@ extend_qtc_library(Nanotrace CONDITION DESIGN_STUDIO_USE_NANOTRACE PUBLIC_DEFINES NANOTRACE_DESIGNSTUDIO_ENABLED ) + +option(NANOTRACEHR_ENABLED "Enables collecting high resolution performance data" OFF) +extend_qtc_library(Nanotrace + SOURCES + nanotracehr.cpp nanotracehr.h +) diff --git a/src/libs/nanotrace/nanotracehr.h b/src/libs/nanotrace/nanotracehr.h index d49e12a87a..74b1381b06 100644 --- a/src/libs/nanotrace/nanotracehr.h +++ b/src/libs/nanotrace/nanotracehr.h @@ -34,7 +34,7 @@ enum class Tracing { IsDisabled, IsEnabled }; constexpr Tracing tracingStatus() { -#ifdef NANOTRACE_ENABLED +#ifdef NANOTRACEHR_ENABLED return Tracing::IsEnabled; #else return Tracing::IsDisabled; @@ -1569,7 +1569,7 @@ template<typename Category, typename... Arguments> Tracer(typename Category::ArgumentType name, Category &category, Arguments &&...) -> Tracer<Category, typename Category::IsActive>; -#ifdef NANOTRACE_ENABLED +#ifdef NANOTRACEHR_ENABLED class GlobalTracer { public: |