diff --git a/cmake/modules/win32-prepare-deps.cmake b/cmake/modules/win32-prepare-deps.cmake index 107609972..9623fada3 100644 --- a/cmake/modules/win32-prepare-deps.cmake +++ b/cmake/modules/win32-prepare-deps.cmake @@ -414,6 +414,7 @@ if(WIN32) foreach( hunsp_counter RANGE 9 ) list(APPEND HUNSPELL_LIBS "libhunspell-1.${hunsp_counter}-0.dll" + "hunspell-1.${hunsp_counter}-0.dll" ) endforeach() find_psi_lib("${HUNSPELL_LIBS}" "${PATHES}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/") diff --git a/iris/src/irisnet/noncore/iceagent.cpp b/iris/src/irisnet/noncore/iceagent.cpp index e3f2e3383..cd90bea0c 100644 --- a/iris/src/irisnet/noncore/iceagent.cpp +++ b/iris/src/irisnet/noncore/iceagent.cpp @@ -18,7 +18,11 @@ struct Foundation { }; }; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) inline uint qHash(const Foundation &f, uint seed = 0) +#else +inline size_t qHash(const Foundation &f, size_t seed = 0) +#endif { auto tmp = uint(f.stunRequestProto) & (uint(f.type) << 8); return qHash(f.baseAddr, seed) ^ qHash(f.stunServAddr, seed) ^ tmp; diff --git a/src/chatviewcommon.cpp b/src/chatviewcommon.cpp index 7015dd306..bb1b46ae7 100644 --- a/src/chatviewcommon.cpp +++ b/src/chatviewcommon.cpp @@ -53,7 +53,11 @@ QString ChatViewCommon::getMucNickColor(const QString &nick, bool isSelf) if (PsiOptions::instance()->getOption("options.ui.muc.use-hash-nick-coloring").toBool()) { /* Hash-driven colors */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) quint32 hash = qHash(nickwoun); // almost unique hash +#else + size_t hash = qHash(nickwoun); // almost unique hash +#endif QList &_palette = generatePalette(); return _palette.at(int(hash % uint(_palette.size()))).name(); } diff --git a/src/main.cpp b/src/main.cpp index ac5c97511..9ee04d01b 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -481,7 +481,11 @@ PSI_EXPORT_FUNC int main(int argc, char *argv[]) #if (defined(Q_OS_MAC) || defined(Q_OS_WIN)) && !defined(ALLOW_QT_PLUGINS_DIR) // remove qt's own plugin path on these platforms, to enable safe // distribution +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QString defaultPluginPath = QLibraryInfo::location(QLibraryInfo::PluginsPath); +#else + QString defaultPluginPath = QLibraryInfo::path(QLibraryInfo::PluginsPath); +#endif if (!getQtPluginPathEnvVar().contains(defaultPluginPath)) QCoreApplication::removeLibraryPath(defaultPluginPath); #endif diff --git a/version b/version index 9c6619c9d..cb8f196c2 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.5.1734 (2024-04-02, 2cdbd2b1) +1.5.1735 (2024-04-02, 438d621b)