Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor fixes to qtsingleapplication

Browse Source
This commit is contained in:
Jonas Kvinge 2019-01-01 21:48:50 +01:00
parent 213f08e171
commit 98791015e5
7 changed files with 19 additions and 19 deletions
3rdparty/qtsingleapplication
qtlocalpeer.cpp
src
CMakeLists.txtmain.cppmain.h

4
3rdparty/qtsingleapplication/qtlocalpeer.cpp vendored

@ -125,7 +125,7 @@ bool QtLocalPeer::isClient()
return true; return true;
bool res = server->listen(socketName); bool res = server->listen(socketName);
#if defined(Q_OS_UNIX) && (QT_VERSION >= QT_VERSION_CHECK(4,5,0)) #ifdef Q_OS_UNIX
// ### Workaround // ### Workaround
if (!res && server->serverError() == QAbstractSocket::AddressInUseError) { if (!res && server->serverError() == QAbstractSocket::AddressInUseError) {
QFile::remove(QDir::cleanPath(QDir::tempPath())+QLatin1Char('/')+socketName); QFile::remove(QDir::cleanPath(QDir::tempPath())+QLatin1Char('/')+socketName);
@ -153,7 +153,7 @@ bool QtLocalPeer::sendMessage(const QString &message, int timeout)
if (connOk || i) if (connOk || i)
break; break;
int ms = 250; int ms = 250;
#if defined(Q_OS_WIN) #ifdef Q_OS_WIN
Sleep(DWORD(ms)); Sleep(DWORD(ms));
#else #else
struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 }; struct timespec ts = { ms / 1000, (ms % 1000) * 1000 * 1000 };

4
src/CMakeLists.txt

@ -72,7 +72,7 @@ link_directories(${TAGLIB_LIBRARY_DIRS})
include_directories(${TAGLIB_INCLUDE_DIRS}) include_directories(${TAGLIB_INCLUDE_DIRS})
include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS}) include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS})
include_directories(${QXT_INCLUDE_DIRS}) include_directories(${QTSINGLECOREAPPLICATION_INCLUDE_DIRS})
include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common) include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common)
include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader) include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader)
@ -1055,7 +1055,7 @@ add_executable(strawberry
MACOSX_BUNDLE MACOSX_BUNDLE
${STRAWBERRY-WIN32-FLAG} ${STRAWBERRY-WIN32-FLAG}
${STRAWBERRY-WIN32-RESOURCES} ${STRAWBERRY-WIN32-RESOURCES}
core/main.cpp main.cpp
) )
if(FREEBSD) if(FREEBSD)

24
src/core/main.cpp → src/main.cpp

@ -68,21 +68,21 @@
#include "core/logging.h" #include "core/logging.h"
#include "qtsingleapplication.h" #include <qtsingleapplication.h>
#include "qtsinglecoreapplication.h" #include <qtsinglecoreapplication.h>
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
# include "mpris.h" # include "core/mpris.h"
#endif #endif
#include "utilities.h" #include "core/utilities.h"
#include "metatypes.h" #include "core/metatypes.h"
#include "iconloader.h" #include "core/iconloader.h"
#include "mainwindow.h" #include "core/mainwindow.h"
#include "commandlineoptions.h" #include "core/commandlineoptions.h"
#include "systemtrayicon.h" #include "core/systemtrayicon.h"
#include "application.h" #include "core/application.h"
#include "networkproxyfactory.h" #include "core/networkproxyfactory.h"
#include "scangiomodulepath.h" #include "core/scangiomodulepath.h"
#include "widgets/osd.h" #include "widgets/osd.h"

0
src/core/main.h → src/main.h