Skip to content

Commit

Permalink
Current version of Psi+ is 1.5.1735
Browse files Browse the repository at this point in the history
It is based on:
* psi: 438d621b
* plugins: 3c71dec
* psimedia: 478567e
* resources: 2ef1865
  • Loading branch information
tehnick committed Apr 2, 2024
1 parent 31343d5 commit 57b6603
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 1 deletion.
1 change: 1 addition & 0 deletions cmake/modules/win32-prepare-deps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}/")
Expand Down
4 changes: 4 additions & 0 deletions iris/src/irisnet/noncore/iceagent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions src/chatviewcommon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<QColor> &_palette = generatePalette();
return _palette.at(int(hash % uint(_palette.size()))).name();
}
Expand Down
4 changes: 4 additions & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.1734 (2024-04-02, 2cdbd2b1)
1.5.1735 (2024-04-02, 438d621b)

0 comments on commit 57b6603

Please sign in to comment.