1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
--- a/mupen64plus-gui/mainwindow.cpp
+++ b/mupen64plus-gui/mainwindow.cpp
@@ -4,6 +4,7 @@
#include <QCloseEvent>
#include <QActionGroup>
#include <QDesktopServices>
+#include <QStandardPaths>
#include "settingsdialog.h"
#include "plugindialog.h"
#include "mainwindow.h"
@@ -44,7 +45,7 @@ void MainWindow::updatePlugins()
#ifdef PLUGIN_DIR_PATH
QString pluginPath = PLUGIN_DIR_PATH;
#else
- QString pluginPath = QCoreApplication::applicationDirPath();
+ QString pluginPath = QStringLiteral(u"/usr/lib/mupen64plus");
#endif
QDir PluginDir(pluginPath);
PluginDir.setFilter(QDir::Files);
@@ -374,7 +375,7 @@ MainWindow::MainWindow(QWidget *parent) :
updatePIF(ui);
if (!settings->contains("configDirPath"))
- settings->setValue("configDirPath", "$CONFIG_PATH$");
+ settings->setValue("configDirPath", QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QStringLiteral(u"/mupen64plus"));
#ifdef CONFIG_DIR_PATH
settings->setValue("configDirPath", CONFIG_DIR_PATH);
@@ -434,7 +435,7 @@ void MainWindow::updateApp()
void MainWindow::setupDiscord()
{
- QLibrary *discordLib = new QLibrary((QDir(QCoreApplication::applicationDirPath()).filePath("discord_game_sdk")), this);
+ QLibrary *discordLib = new QLibrary(QStringLiteral(u"/usr/lib/discord_game_sdk"), this);
memset(&discord_app, 0, sizeof(discord_app));
@@ -1019,7 +1020,7 @@ void MainWindow::loadCoreLib()
#ifdef CORE_LIBRARY_PATH
QString corePath = CORE_LIBRARY_PATH;
#else
- QString corePath = QCoreApplication::applicationDirPath();
+ QString corePath = QStringLiteral(u"/usr/lib");
#endif
m64p_error res = osal_dynlib_open(&coreLib, QDir(corePath).filePath(OSAL_DEFAULT_DYNLIB_FILENAME).toUtf8().constData());
@@ -1109,7 +1110,7 @@ void MainWindow::loadPlugins()
#ifdef PLUGIN_DIR_PATH
QString pluginPath = PLUGIN_DIR_PATH;
#else
- QString pluginPath = QCoreApplication::applicationDirPath();
+ QString pluginPath = QStringLiteral(u"/usr/lib/mupen64plus");
#endif
QString file_path;
QString plugin_path;
--- a/mupen64plus-gui/settingsdialog.cpp
+++ b/mupen64plus-gui/settingsdialog.cpp
@@ -58,7 +58,7 @@ void SettingsDialog::initStuff()
#ifdef PLUGIN_DIR_PATH
QString pluginPath = PLUGIN_DIR_PATH;
#else
- QString pluginPath = QCoreApplication::applicationDirPath();
+ QString pluginPath = QStringLiteral(u"/usr/lib/mupen64plus");
#endif
QDir PluginDir(pluginPath);
QStringList Filter;
|