Adding upstream version 1.96~38-g975f8ce.

cmake/LXQtTranslateDesktop.cmake

@@ -71,13 +71,13 @@ function(lxqt_translate_desktop _RESULT)
         set(_pattern "'\\[.*]\\s*='")
         if (_translations)
             add_custom_command(OUTPUT ${_outFile}
-                COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
-                COMMAND grep -h ${_pattern} ${_translations} >> ${_outFile}
+                COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+                COMMAND grep -h -a ${_pattern} ${_translations} >> ${_outFile}
                 COMMENT "Generating ${_fileName}${_fileExt}"
             )
         else()
             add_custom_command(OUTPUT ${_outFile}
-                COMMAND grep -v "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
+                COMMAND grep -v -a "'#TRANSLATIONS_DIR='" ${_inFile} > ${_outFile}
                 COMMENT "Generating ${_fileName}${_fileExt}"
             )
         endif()

src/core/ui/about.cpp

@@ -31,8 +31,16 @@ AboutDialog::AboutDialog(QWidget *parent):
     _ui->setupUi(this);
     _ui->labAppName->setText(_ui->labAppName->text() + QString(" <b>") + qApp->applicationVersion() + QString("</b>"));
 
+    QString versionInfo;
+    versionInfo = tr("built on ");
+    versionInfo.append(__DATE__);
+    versionInfo.append(" ");
+    versionInfo.append(__TIME__);
+
     _ui->labQtVer->setText(tr("using Qt ") + qVersion());
 
+    _ui->labVersion->setText(versionInfo);
+
     QTabBar *tabs = new QTabBar;
 
     _ui->frame->layout()->addWidget(tabs);