diff options
| author | stonedDiscord <Tukz@gmx.de> | 2022-12-28 21:35:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-28 21:35:11 +0100 |
| commit | a449aa86e9f1758b5661fba640a626bc12080988 (patch) | |
| tree | 8aa2a5a6272a2b8c93a22e3b019d6773f97db585 /src/path_functions.cpp | |
| parent | 1aca9a19dbc9f2c83de39f71fc2ff284ca33984d (diff) | |
Qt6 (#824)
* Major cleanup of screenshake code
* Add pre-5.10 support for screenshake math
* more compat, uglier too
* add surprise tool
* we don't need inline functions
* only run qsrand on old versions
* Squash compiler warnings
* >= not > please
* don't set codec in qt6
* switch to new regex
* remove qdesktopwidget (was unused)
* make enter event an enter event
* forgot header file
* rename emote_mod enum as there is an enum of the same name in chat_message
* regexp
* no more codec
* fix warning about emote_mod type
* change to new qtconcurrent
* misc was unused
* fix run
* change qtconcurrent for music
* codecs came back
* make CI run on qt6 too
* seperate artifacts
* qFormatLogMessage is wonky here
* maybe actually use the qt version from matrix
* change qt version here as well
* even lower
* use my own fixed installer
* use my own fixed version of qapng
* get websockets
* minor spelling mistake
* yOu nEeD aDdOnS
* aaaaaaaaaaaaaaaaaaaaaaaaaaaaa
* Revert "maybe actually use the qt version from matrix"
This reverts commit 7ab6b1b4c2f1200318d52f325efd2ef46c3fbd6a.
* Revert "Revert "maybe actually use the qt version from matrix""
This reverts commit a6f7c5bedf214a1992c15b296edd195f96a9196a.
* use jurplels again
* Revert "use jurplels again"
This reverts commit 5795474bca64590f1479af3ccbf7d8cc57f427e7.
* revert CI to master
* main not master
Co-authored-by: in1tiate <woodward.randall02+github@gmail.com>
Diffstat (limited to 'src/path_functions.cpp')
| -rw-r--r-- | src/path_functions.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/path_functions.cpp b/src/path_functions.cpp index 45920d50..2128ad93 100644 --- a/src/path_functions.cpp +++ b/src/path_functions.cpp @@ -3,7 +3,7 @@ #include "file_functions.h" #include <QDir> -#include <QRegExp> +#include <QRegularExpression> #include <QStandardPaths> #include <QStringBuilder> @@ -235,14 +235,14 @@ QString AOApplication::get_config_value(QString p_identifier, QString p_config, path = get_real_path(p); if (!path.isEmpty()) { QSettings settings(path, QSettings::IniFormat); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) settings.setIniCodec("UTF-8"); +#endif QVariant value = settings.value(p_identifier); if (value.type() == QVariant::StringList) { -// qDebug() << "got" << p << "is a string list, returning" << value.toStringList().join(","); return value.toStringList().join(","); } else if (!value.isNull()){ -// qDebug() << "got" << p << "is a string, returning" << value.toString(); return value.toString(); } } |