blue/squawk
blue
/
squawk
2
3
Fork 6
Code Issues 21 Pull Requests 2 Actions Releases 10 Wiki Activity

port to Windows (mingw64) and macOS; create appveyor.yml #50

Merged
blue merged 18 commits from shunf4/squawk:feat/adapt_win_osx_msgf into messageFeed 2021-10-11 10:40:46 +00:00
Conversation 3 Commits 18 Files Changed 12 +2 -8
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6764d8ea11 - Show all commits

1
CMakeLists.txt
View File

@ -147,7 +147,6 @@ add_subdirectory(external/simpleCrypt)
target_link_libraries(squawk squawkUI) target_link_libraries(squawk squawkUI)
target_link_libraries(squawk squawkCORE) target_link_libraries(squawk squawkCORE)
target_link_libraries(squawk uuid)
add_dependencies(${CMAKE_PROJECT_NAME} translations) add_dependencies(${CMAKE_PROJECT_NAME} translations)

8
shared/utils.cpp
View File

@ -17,15 +17,11 @@
*/ */
#include "utils.h" #include "utils.h"
#include <QUuid>
QString Shared::generateUUID() QString Shared::generateUUID()
{ {
uuid_t uuid; return QUuid::createUuid().toString();
uuid_generate(uuid);
char uuid_str[36];
uuid_unparse_lower(uuid, uuid_str);
return uuid_str;
} }

1
shared/utils.h
View File

@ -23,7 +23,6 @@
#include <QColor> #include <QColor>
#include <QRegularExpression> #include <QRegularExpression>
#include <uuid/uuid.h>
#include <vector> #include <vector>
namespace Shared { namespace Shared {