diff options
| author | Felix (xq) Queißner <git@mq32.de> | 2020-06-11 21:24:23 +0200 |
|---|---|---|
| committer | Felix (xq) Queißner <git@mq32.de> | 2020-06-11 21:24:23 +0200 |
| commit | 0c57280c4eec7ddce569f89cb35de917d8b4d08e (patch) | |
| tree | 628ee84e0ab6b6e1fb0a7677c1bce8ad1aa374ea | |
| parent | 13f8e8ee5f4bd59281b52a961bed7c73f2e297f2 (diff) | |
| parent | 6e4d663cdaec2496cf9d3345096d556bbd0b811b (diff) | |
| download | kristall-0c57280c4eec7ddce569f89cb35de917d8b4d08e.tar.gz | |
Merge branch 'master' of github.com:MasterQ32/kristall
| -rw-r--r-- | README.md | 12 | ||||
| -rw-r--r-- | src/certificateselectiondialog.cpp | 2 | ||||
| -rw-r--r-- | src/documentstyle.cpp | 1 | ||||
| -rw-r--r-- | src/kristall.pro | 12 |
4 files changed, 24 insertions, 3 deletions
@@ -90,7 +90,17 @@ make #### Windows -Just use QtCreator to build `./src/kristall.pro`. Default settings should be fine. +Compile OpenSSL with the following steps: +- Install [Perl](https://www.perl.org/get.html) (either ActiveState or Strawberry) +- Install [NASM](https://www.nasm.us/) +- Add both to your PATH +- Clone [OpenSSL](https://github.com/openssl/openssl) +- Open a Visual Studio Developer Command Prompt (or a command prompt that has ran vcvarsall.bat). You will need Administrator privileges for the install step +- In the OpenSSL root directory, run `perl Configure VC-WIN32` if compiling for 32 bit, `perl Configure VC-WIN64A` for 64 bit +- Run `nmake` +- Run `nmake install` to install OpenSSL in `C:\Program Files\OpenSSL` + +Use QtCreator to build `./src/kristall.pro` with default settings. #### MacOS X diff --git a/src/certificateselectiondialog.cpp b/src/certificateselectiondialog.cpp index 6c4a1f0..280b5db 100644 --- a/src/certificateselectiondialog.cpp +++ b/src/certificateselectiondialog.cpp @@ -68,7 +68,7 @@ void CertificateSelectionDialog::acceptTemporaryWithTimeout(QDateTime timeout) std::default_random_engine rng; rng.seed(QDateTime::currentDateTime().toMSecsSinceEpoch()); - std::uniform_int_distribution<char> distr; + std::uniform_int_distribution<int> distr(0, 255); char items[8]; for(auto & c : items) { diff --git a/src/documentstyle.cpp b/src/documentstyle.cpp index 50a4168..e8a4751 100644 --- a/src/documentstyle.cpp +++ b/src/documentstyle.cpp @@ -7,6 +7,7 @@ #include <QCryptographicHash> #include <QDebug> +#include <array> #include <cmath> static QString encodeCssFont (const QFont& refFont) diff --git a/src/kristall.pro b/src/kristall.pro index 73f2892..8c98a4b 100644 --- a/src/kristall.pro +++ b/src/kristall.pro @@ -15,10 +15,20 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 +LIBS += -lcrypto QMAKE_CFLAGS += -Wno-unused-parameter QMAKE_CXXFLAGS += -Wno-unused-parameter -LIBS += -lcrypto +win32-msvc { + QMAKE_CFLAGS -= -Wno-unused-parameter + QMAKE_CXXFLAGS -= -Wno-unused-parameter + + QMAKE_CFLAGS += /permissive- + QMAKE_CXXFLAGS += /permissive- + LIBS -= -lcrypto + LIBS += "C:\Program Files\OpenSSL\lib\libcrypto.lib" + INCLUDEPATH += "C:\Program Files\OpenSSL\include" +} INCLUDEPATH += $$PWD/../lib/luis-l-gist/ DEPENDPATH += $$PWD/../lib/luis-l-gist/ |