StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(osx): Update deprecated QDateTime and QProcess APIs

Browse Source
This commit is contained in:
Anthony Bilinski 2020-11-21 06:25:29 -08:00
parent bc2d41b42d
commit b42b1f5e15
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/persistence/history.cpp
View File

@ -872,7 +872,11 @@ QDateTime History::getDateWhereFindPhrase(const QString& friendPk, const QDateTi
} }
if (parameter.period == PeriodSearch::AfterDate || parameter.period == PeriodSearch::BeforeDate) { if (parameter.period == PeriodSearch::AfterDate || parameter.period == PeriodSearch::BeforeDate) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
date = parameter.date.startOfDay();
#else
date = QDateTime(parameter.date); date = QDateTime(parameter.date);
#endif
} }
QString period; QString period;

12
src/platform/install_osx.cpp
View File

@ -52,8 +52,6 @@ void osx::moveToAppFolder()
QString bindir = qApp->applicationDirPath(); QString bindir = qApp->applicationDirPath();
QString appdir = bindir; QString appdir = bindir;
appdir.chop(15); appdir.chop(15);
QString sudo = bindir + "/qtox_sudo rsync -avzhpltK " + appdir + " /Applications";
QString qtox = "open /Applications/qtox.app";
QString appdir_noqtox = appdir; QString appdir_noqtox = appdir;
appdir_noqtox.chop(8); appdir_noqtox.chop(8);
@ -66,7 +64,9 @@ void osx::moveToAppFolder()
QDir old_app(appdir); QDir old_app(appdir);
sudoprocess->start(sudo); // Where the magic actually happens, safety checks ^ const QString sudoProgram = bindir + "/qtox_sudo";
const QStringList sudoArguments = {"rsync", "-avzhpltK", appdir, "/Applications"};
sudoprocess->start(sudoProgram, sudoArguments); // Where the magic actually happens, safety checks ^
sudoprocess->waitForFinished(); sudoprocess->waitForFinished();
if (old_app.removeRecursively()) // We've just deleted the running program if (old_app.removeRecursively()) // We've just deleted the running program
@ -77,7 +77,9 @@ void osx::moveToAppFolder()
if (fork() != 0) // Forking is required otherwise it won't actually cleanly launch if (fork() != 0) // Forking is required otherwise it won't actually cleanly launch
exit(EXIT_UPDATE_MACX); exit(EXIT_UPDATE_MACX);
qtoxprocess->start(qtox); const QString qtoxProgram = "open";
const QStringList qtoxArguments = {"/Applications/qtox.app"};
qtoxprocess->start(qtoxProgram, qtoxArguments);
exit(0); // Actually kills it exit(0); // Actually kills it
} }
@ -107,7 +109,7 @@ void osx::migrateProfiles()
qDebug() << "OS X: Profile migration failed. ~/Library/Application Support/Tox already " qDebug() << "OS X: Profile migration failed. ~/Library/Application Support/Tox already "
"exists. Using alternate migration method."; "exists. Using alternate migration method.";
QString OSXMigrater = "../Resources/OSX-Migrater.sh"; QString OSXMigrater = "../Resources/OSX-Migrater.sh";
QProcess::execute(OSXMigrater); QProcess::execute(OSXMigrater, {});
QMessageBox MigrateProfile; QMessageBox MigrateProfile;
MigrateProfile.setIcon(QMessageBox::Information); MigrateProfile.setIcon(QMessageBox::Information);
MigrateProfile.setWindowModality(Qt::ApplicationModal); MigrateProfile.setWindowModality(Qt::ApplicationModal);