whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no-thread: add QProcess config check 

Disable QGraphicsFrameCapture for the no-thread (and
no-process) configuration.

Change-Id: I7767098efff78338a763ff192512d484cd300c1d

Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
bb10
Morten Sørvig 2023-10-24 13:24:52 +02:00
parent 3fc1951f41
commit 13bb9fcdae
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/util/qgraphicsframecapturemetal.mm
View File

@ -27,7 +27,7 @@ QGraphicsFrameCaptureMetal::QGraphicsFrameCaptureMetal()
QGraphicsFrameCaptureMetal::~QGraphicsFrameCaptureMetal()
{
#ifdef Q_OS_MACOS
#if defined(Q_OS_MACOS) && QT_CONFIG(process)
if (m_process) {
m_process->terminate();
delete m_process;
@ -131,7 +131,10 @@ bool QGraphicsFrameCaptureMetal::isCapturing() const
void QGraphicsFrameCaptureMetal::openCapture()
{
#ifdef Q_OS_MACOS
#if defined(Q_OS_MACOS)
#if !QT_CONFIG(process)
qFatal("QGraphicsFrameCapture requires QProcess on macOS");
#else
if (!initialized()) {
qCWarning(lcGraphicsFrameCapture) << "Capturing on Metal was not initialized. Can not open XCode with a valid capture.";
return;
@ -148,6 +151,7 @@ void QGraphicsFrameCaptureMetal::openCapture()
m_process->kill();
m_process->start();
#endif
#endif
}
void QGraphicsFrameCaptureMetal::updateCaptureFileName()

2
src/gui/util/qgraphicsframecapturemetal_p_p.h
View File

@ -42,7 +42,7 @@ public:
private:
void updateCaptureFileName();
#ifdef Q_OS_MACOS
#if defined(Q_OS_MACOS) && QT_CONFIG(process)
QProcess *m_process = nullptr;
#endif
MTLCaptureManager *m_captureManager = nullptr;