dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SingleApplication static functions called from instance

Browse Source
This commit is contained in:
EmmanuelMess
2021-09-09 20:46:13 -03:00
committed by Jonas Kvinge
parent 8ca0b54b18
commit 68c44daef2
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.cpp
View File

@@ -192,7 +192,7 @@ int main(int argc, char *argv[]) {
}
return 0;
}
a.setQuitOnLastWindowClosed(false);
QGuiApplication::setQuitOnLastWindowClosed(false);
#if defined(USE_BUNDLE) && (defined(Q_OS_LINUX) || defined(Q_OS_MACOS))
qLog(Debug) << "Looking for resources in" << QCoreApplication::applicationDirPath() + "/" + USE_BUNDLE_DIR;
@@ -272,7 +272,7 @@ int main(int argc, char *argv[]) {
#endif
translations->LoadTranslation("strawberry", ":/translations", language);
translations->LoadTranslation("strawberry", TRANSLATIONS_DIR, language);
translations->LoadTranslation("strawberry", a.applicationDirPath(), language);
translations->LoadTranslation("strawberry", QCoreApplication::applicationDirPath(), language);
translations->LoadTranslation("strawberry", QDir::currentPath(), language);
#ifdef HAVE_QTSPARKLE
@@ -313,7 +313,7 @@ int main(int argc, char *argv[]) {
#endif
QObject::connect(&a, &SingleApplication::receivedMessage, &w, QOverload<quint32, const QByteArray&>::of(&MainWindow::CommandlineOptionsReceived));
int ret = a.exec();
int ret = QCoreApplication::exec();
return ret;
}