From 5e223a7f74bffaea4b355ed7617c26de4504019f Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Fri, 11 Oct 2019 16:50:52 +0300 Subject: Disables SingleApplication support on Android. Fixes #52 --- singleapplication.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/singleapplication.cpp b/singleapplication.cpp index bc9e059..f8c4bf8 100644 --- a/singleapplication.cpp +++ b/singleapplication.cpp @@ -41,6 +41,13 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda { Q_D(SingleApplication); +#ifdef Q_OS_ANDROID + // On Android since the library is not supported fallback to standard + // QApplication behaviour by simply returning. + qWarning() << "SingleApplication is not supported on Android systems."; + return; +#endif + // Store the current mode of the program d->options = options; -- cgit v1.2.1 From 117336df796e0abcda73dd43019e2cf050418d9c Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Sun, 13 Oct 2019 10:34:28 +0300 Subject: Fallback for iOS as well --- singleapplication.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/singleapplication.cpp b/singleapplication.cpp index f8c4bf8..ba35c3a 100644 --- a/singleapplication.cpp +++ b/singleapplication.cpp @@ -41,10 +41,10 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda { Q_D(SingleApplication); -#ifdef Q_OS_ANDROID - // On Android since the library is not supported fallback to standard - // QApplication behaviour by simply returning. - qWarning() << "SingleApplication is not supported on Android systems."; +#if defined(Q_OS_ANDROID) || defined(Q_OS_IOS) + // On Android and iOS since the library is not supported fallback to + // standard QApplication behaviour by simply returning at this point. + qWarning() << "SingleApplication is not supported on Android and iOS systems."; return; #endif -- cgit v1.2.1 From c5b4d4028d4f6ca8b02fc0262739a3834ab1a7b7 Mon Sep 17 00:00:00 2001 From: Itay Grudev Date: Sun, 13 Oct 2019 10:35:50 +0300 Subject: v3.0.18 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 684d260..9efd3fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog ========= +__3.0.18__ +---------- + +* Fallback to standard QApplication class on iOS and Android systems where + the library is not supported. + __3.0.17__ ---------- -- cgit v1.2.1