From da197fc84bf4fafb0d5dc6d2efe7c6f42bc96fc0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 9 Jan 2023 18:05:35 +0200 Subject: [PATCH] Add comments. --- qbs/imports/VApp.qbs | 9 +++++++++ qbs/modules/vcs2/vcs2.qbs | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/qbs/imports/VApp.qbs b/qbs/imports/VApp.qbs index f0353620d..e0c95198d 100644 --- a/qbs/imports/VApp.qbs +++ b/qbs/imports/VApp.qbs @@ -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()) diff --git a/qbs/modules/vcs2/vcs2.qbs b/qbs/modules/vcs2/vcs2.qbs index 62a594285..ebe8f4704 100644 --- a/qbs/modules/vcs2/vcs2.qbs +++ b/qbs/modules/vcs2/vcs2.qbs @@ -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)