File 0005-Use-std-thread-instead-of-QThread-for-Qt-5... of Package rstudio

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch of Package rstudio (Revision 65e4dd80ea1e2b4c620d509c6b813877)

Currently displaying revision 65e4dd80ea1e2b4c620d509c6b813877 , Show latest

From 5682be6d2e4c7020bf8395486dfeba81b16ab9f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
Date: Mon, 13 Jan 2020 15:05:12 +0100
Subject: [PATCH 5/9] Use std::thread instead of QThread for Qt < 5.10 support

---
 src/cpp/desktop/DesktopInfo.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/cpp/desktop/DesktopInfo.cpp b/src/cpp/desktop/DesktopInfo.cpp
index b72b4e9888..cf27b90f64 100644
--- a/src/cpp/desktop/DesktopInfo.cpp
+++ b/src/cpp/desktop/DesktopInfo.cpp
@@ -20,7 +20,8 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <QThread>
+#include <thread>
+#include <memory>
 
 #include <core/Algorithm.hpp>
 #include <core/SafeConvert.hpp>
@@ -47,7 +48,7 @@ namespace {
 
 #ifndef Q_OS_MAC
 std::atomic<bool> s_abortRequested(false);
-QThread* s_fontDatabaseWorker = nullptr;
+std::thread s_fontDatabaseWorker;
 #endif
 
 QString s_platform             = kUnknown;
@@ -132,8 +133,7 @@ void buildFontDatabase()
 
 #endif
 
-   s_fontDatabaseWorker = QThread::create(buildFontDatabaseImpl);
-   s_fontDatabaseWorker->start();
+   s_fontDatabaseWorker = std::thread(buildFontDatabaseImpl);
 }
 
 #else
@@ -231,10 +231,10 @@ void initialize()
 void DesktopInfo::onClose()
 {
 #ifndef Q_OS_MAC
-   if (s_fontDatabaseWorker && s_fontDatabaseWorker->isRunning())
+   if (s_fontDatabaseWorker.joinable())
    {
       s_abortRequested = true;
-      s_fontDatabaseWorker->wait(1000);
+      s_fontDatabaseWorker.join();
    }
 #endif
 }
-- 
2.25.0

Places

File 0005-Use-std-thread-instead-of-QThread-for-Qt-5.10-suppor.patch of Package rstudio (Revision 65e4dd80ea1e2b4c620d509c6b813877)

Places