diff options
| author | Alexandros Naskos <alex_naskos@hotmail.com> | 2020-06-11 22:02:17 +0300 |
|---|---|---|
| committer | Alexandros Naskos <alex_naskos@hotmail.com> | 2020-06-11 22:02:17 +0300 |
| commit | 84a010e6454ff641df894333a5a60c50f1f85c1b (patch) | |
| tree | e7b92a2a7e19a67ea7c246fa2fc1380d7c6a69db /src | |
| parent | 04c24245d5779e1d4be4b28d0e208297f2889066 (diff) | |
| download | kristall-84a010e6454ff641df894333a5a60c50f1f85c1b.tar.gz | |
Windows (MSVC) build fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/certificateselectiondialog.cpp | 2 | ||||
| -rw-r--r-- | src/documentstyle.cpp | 1 | ||||
| -rw-r--r-- | src/kristall.pro | 10 |
3 files changed, 9 insertions, 4 deletions
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..a8c7d03 100644 --- a/src/kristall.pro +++ b/src/kristall.pro @@ -15,10 +15,14 @@ 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 -QMAKE_CFLAGS += -Wno-unused-parameter -QMAKE_CXXFLAGS += -Wno-unused-parameter - LIBS += -lcrypto +win32-msvc { + 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/ |