Merge tag '1.7.18' into develop

Finish 1.7.18

.github/workflows/cmake.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ubuntu_version: [20.04, 22.04]
+        ubuntu_version: [22.04]
         qt_version: [5.15.2, 6.4.0]
         static: [ON, OFF]
 
@@ -69,7 +69,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        win_version: [2019, 2022]
+        win_version: [2022]
         qt_version: [5.15.2, 6.4.0]
         static: [ON, OFF]
 

.idea/vcs.xml

@@ -2,6 +2,5 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/3rdparty/qtxlsx" vcs="Git" />
   </component>
 </project>

limereport/limereport.pri

@@ -245,11 +245,19 @@ system("git --version") {
 }
 
 VERSION_TEMPLATE = $$PWD/version.h.in
+VERSION_OUTPUT = $$OUT_PWD/version.h
+
+defineReplace(generateHeader){
+    VERSION_TEMPLATE = $$1
+    OUTPUT_FILE = $$2
+    LINES = $$cat($$VERSION_TEMPLATE, lines)
+    LINES = $$replace(LINES, @GIT_VERSION@, $$LR_VERSION)
+    system(echo '// Auto generated version header' > $$OUTPUT_FILE)
+    for (a, LINES): system(echo '$${a}' >> $$OUTPUT_FILE)
+}
 
 generateversion.depends = FORCE
-generateversion.input = VERSION_TEMPLATE
-generateversion.output = $$OUT_PWD/version.h
-generateversion.commands = $$QMAKE_STREAM_EDITOR \'s/@GIT_VERSION@/$$LR_VERSION/\' ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
+generateversion.commands = $$generateHeader($$VERSION_TEMPLATE, $$VERSION_OUTPUT)
 generateversion.CONFIG = no_link target_predeps
 
 QMAKE_EXTRA_COMPILERS += generateversion

limereport/limereport.pro

@@ -35,6 +35,12 @@ CONFIG(staticlib) {
     DEFINES -= LIMEREPORT_EXPORTS
 }
 
+contains(CONFIG, x86_64) {
+    message(Цель: 64 бита)
+} else {
+    message(Цель: 32 бита)
+}
+
 EXTRA_FILES += \
     $$PWD/lrglobal.h \
     $$PWD/lrdatasourceintf.h \

limereport/scripteditor/lrcompletermodel.cpp

@@ -25,8 +25,8 @@ QModelIndex CompleterModel::index(int row, int column, const QModelIndex& parent
 QModelIndex CompleterModel::parent(const QModelIndex& child) const
 {
     if (child.isValid()) {
-        if (CompleterItem* childItem = static_cast<CompleterItem*>(child.internalPointer());
-            childItem) {
+        CompleterItem* childItem = static_cast<CompleterItem*>(child.internalPointer());
+        if (childItem) {
             CompleterItem* parentItem = childItem->parent();
             if (parentItem != &m_root) {
                 return indexFromItem(parentItem);