Skip to content

Commit ad97448

Browse files
committed
GUI - remove singleapplication lib
Getting transient issues with the latest Qt on macOS
1 parent a6f5d8b commit ad97448

35 files changed

+5
-3028
lines changed

app/gui/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ project("Sonic Pi"
1313
HOMEPAGE_URL "https://sonic-pi.net"
1414
)
1515

16-
set(QAPPLICATION_CLASS QApplication CACHE STRING "Inheritance class for SingleApplication")
16+
1717
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1818

1919
set(QTAPP_ROOT ${CMAKE_CURRENT_LIST_DIR})
@@ -67,7 +67,7 @@ if(NOT QScintilla_FOUND)
6767
endif()
6868

6969

70-
add_subdirectory(vendor/SingleApplication)
70+
7171

7272
set(APP_NAME sonic-pi)
7373
set(MACOS_APP_NAME "Sonic Pi")
@@ -308,8 +308,8 @@ target_link_libraries(${APP_NAME}
308308
PRIVATE
309309
SonicPi::API
310310
QScintilla
311-
Threads::Threads
312-
SingleApplication::SingleApplication)
311+
Threads::Threads)
312+
313313

314314
target_link_libraries(${APP_NAME}
315315
PRIVATE

app/gui/main.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <QLibraryInfo>
2222
#include <QThread>
2323

24-
#include <singleapplication.h>
2524
#include "mainwindow.h"
2625

2726
#include "widgets/sonicpilog.h"
@@ -73,8 +72,7 @@ int main(int argc, char *argv[])
7372
QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
7473
#endif
7574

76-
SingleApplication app(argc, argv);
77-
75+
QApplication app(argc, argv);
7876
QFontDatabase::addApplicationFont(":/fonts/Hack-Regular.ttf");
7977
QFontDatabase::addApplicationFont(":/fonts/Hack-Italic.ttf");
8078
QFontDatabase::addApplicationFont(":/fonts/Hack-Bold.ttf");

app/gui/vendor/SingleApplication/.github/FUNDING.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

app/gui/vendor/SingleApplication/.github/workflows/doxygen.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.

app/gui/vendor/SingleApplication/.github/workflows/main.yml

Lines changed: 0 additions & 111 deletions
This file was deleted.

app/gui/vendor/SingleApplication/.gitignore

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)