aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add comments.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-01-09 18:05:35 +02:00
parent ea1195f9fa
commit da197fc84b
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qbs/imports/VApp.qbs
View File

@ -51,6 +51,15 @@ CppApplication {
}
Group {
// See question on StackOwerflow "QSslSocket error when SSL is NOT used" (http://stackoverflow.com/a/31277055/3045403)
// Copy of answer:
// We occasionally had customers getting very similar warning messages but the software was also crashing.
// We determined it was because, although we weren't using SSL either, the program found a copy of OpenSSL on the
// customer's computer and tried interfacing with it. The version it found was too old though (from Qt 5.2 onwards v1.0.0
// or later is required).
//
// Our solution was to distribute the OpenSSL DLLs along with our application (~1.65 MB). The alternative is to compile
// Qt from scratch without OpenSSL support.
condition: qbs.targetOS.contains("windows") && (qbs.architecture.contains("x86_64") || qbs.architecture.contains("x86"))
name: "openssl"
prefix: FileInfo.joinPaths(project.sourceDirectory, "dist", "win", "openssl", FileInfo.pathSeparator())

4
qbs/modules/vcs2/vcs2.qbs
View File

@ -95,6 +95,10 @@ Module {
var proc = new Process();
try {
proc.setWorkingDirectory(theRepoDir);
// tag is formatted as TAG-N-gSHA:
// 1. latest stable version is TAG, or vX.Y.Z
// 2. number of commits since latest stable version is N
// 3. latest commit is gSHA
proc.exec(tool, ["describe", "--always", "HEAD"], true);
repoState = proc.readStdOut().trim();
if (repoState)