From a8a36869d313dd756bf5974e1180b7c09030927e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aki=20=C3=9Acar?= <iucar@fedoraproject.org>
Date: Fri, 8 Jul 2022 15:37:13 +0200
Subject: [PATCH] unbundle qtsingleapplication

---
 src/cpp/desktop/CMakeLists.txt              | 5 ++---
 src/cpp/desktop/DesktopPosixApplication.hpp | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/cpp/desktop/CMakeLists.txt b/src/cpp/desktop/CMakeLists.txt
index 651bbda..7769577 100644
--- a/src/cpp/desktop/CMakeLists.txt
+++ b/src/cpp/desktop/CMakeLists.txt
@@ -162,7 +162,6 @@ if(NOT RSTUDIO_ELECTRON)
 
    set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES})
    list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES
-      ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h
       ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp
       ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp
       ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp
@@ -232,8 +231,6 @@ if(NOT RSTUDIO_ELECTRON)
       DesktopSynctex.cpp
       DesktopJobLauncherOverlay.cpp
       RemoteDesktopSessionLauncherOverlay.cpp
-      3rdparty/qtsingleapplication/qtsingleapplication.cpp
-      3rdparty/qtsingleapplication/qtlocalpeer.cpp
    )
 
    if(WIN32)
@@ -405,6 +402,7 @@ if(NOT RSTUDIO_ELECTRON)
       target_link_libraries(rstudio
          ${RSTUDIO_QTMODULES}
          ${QT_LIBRARIES}
+         Qt5Solutions_SingleApplication-2.6
          ${Boost_LIBRARIES}
          rstudio-core
          ${CRASHPAD_LIBRARIES}
@@ -448,6 +446,7 @@ if(NOT RSTUDIO_ELECTRON)
       target_link_libraries(RStudio
          ${RSTUDIO_QTMODULES}
          ${QT_LIBRARIES}
+         Qt5Solutions_SingleApplication-2.6
          rstudio-core
          ${APPLICATION_SERVICES_LIBRARY}
          ${COCOA_LIBRARY}
diff --git a/src/cpp/desktop/DesktopPosixApplication.hpp b/src/cpp/desktop/DesktopPosixApplication.hpp
index 4d85eec..cf0285e 100644
--- a/src/cpp/desktop/DesktopPosixApplication.hpp
+++ b/src/cpp/desktop/DesktopPosixApplication.hpp
@@ -16,7 +16,7 @@
 #ifndef DESKTOP_POSIX_APPLICATION_HPP
 #define DESKTOP_POSIX_APPLICATION_HPP
 
-#include "3rdparty/qtsingleapplication/QtSingleApplication"
+#include <qt5/QtSolutions/QtSingleApplication>
 
 #include "DesktopApplicationLaunch.hpp"
 
-- 
2.34.1