summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@qt.io>2022-06-10 14:19:23 +0200
committerRobert Griebl <robert.griebl@qt.io>2022-06-10 14:25:09 +0200
commite4c642714ef4484bc3d56d2a2a061c48e2c6665d (patch)
treed63faca76a9e829956051a74545bb257db6a497e
parent810cf1fc7dcb5ca0b6d3bdcc364ce9e3f212f806 (diff)
downloadqtapplicationmanager-e4c642714ef4484bc3d56d2a2a061c48e2c6665d.tar.gz
The QQmlDebuggingHelper c'tor is deprecated nowadays
Change-Id: I83222cb3664d52313376f9fcde12df512d9db005 Pick-to: dev Reviewed-by: Robert Griebl <robert.griebl@qt.io>
-rw-r--r--src/shared-main-lib/sharedmain.cpp6
-rw-r--r--src/shared-main-lib/sharedmain.h2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/shared-main-lib/sharedmain.cpp b/src/shared-main-lib/sharedmain.cpp
index 176b6770..b9bd9aa4 100644
--- a/src/shared-main-lib/sharedmain.cpp
+++ b/src/shared-main-lib/sharedmain.cpp
@@ -98,9 +98,7 @@ SharedMain::SharedMain()
}
SharedMain::~SharedMain()
-{
- delete m_debuggingEnabler;
-}
+{ }
// Initialization routine that needs to be called BEFORE the Q*Application constructor
void SharedMain::initialize()
@@ -149,7 +147,7 @@ void SharedMain::setupQmlDebugging(bool qmlDebugging)
if (hasJSDebugArg || qmlDebugging) {
#if !defined(QT_NO_QML_DEBUGGER)
- m_debuggingEnabler = new QQmlDebuggingEnabler(true);
+ QQmlDebuggingEnabler::enableDebugging(true);
if (!QLoggingCategory::defaultCategory()->isDebugEnabled()) {
qCCritical(LogRuntime) << "The default 'debug' logging category was disabled. "
"Re-enabling it for the QML Debugger interface to work correctly.";
diff --git a/src/shared-main-lib/sharedmain.h b/src/shared-main-lib/sharedmain.h
index d9a2be6b..afbc6d9f 100644
--- a/src/shared-main-lib/sharedmain.h
+++ b/src/shared-main-lib/sharedmain.h
@@ -55,8 +55,6 @@ public:
void checkOpenGLFormat(const char *what, const QSurfaceFormat &format) const;
private:
- QQmlDebuggingEnabler *m_debuggingEnabler = nullptr;
-
static bool s_initialized;
QSurfaceFormat::OpenGLContextProfile m_requestedOpenGLProfile = QSurfaceFormat::NoProfile;
int m_requestedOpenGLMajorVersion = -1;