From 39ae18ec96ab9754d237590ac381ceefc11921be Mon Sep 17 00:00:00 2001
From: Esko Pekkarinen <esko.pekkarinen@tut.fi>
Date: Fri, 29 Jun 2018 09:09:20 +0300
Subject: [PATCH] [PERFECTIVE] Updated files for release.

---
 Administrative/releaseFiles/release_notes.txt         | 11 +++++++++++
 Administrative/releaseFiles/setupx64.nsi              |  2 +-
 .../validators/AbstractionDefinitionValidator.cpp     |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/Administrative/releaseFiles/release_notes.txt b/Administrative/releaseFiles/release_notes.txt
index a90d1b91d..e0c3048c1 100644
--- a/Administrative/releaseFiles/release_notes.txt
+++ b/Administrative/releaseFiles/release_notes.txt
@@ -8,6 +8,17 @@
               * Changed or Information
 ===============================================================================
 
+29/06/2018 3.6.50
+----------------------------------------------------
+
++ Added editor for AbstractionDefinition transactional ports
++ Added option to extend BusDefinitions
++ Added editor for field reserved-value
++ Added SystemVerilog files to be included in generated Quartus projects
+
+- Fixed an issue where modifying/removing files outside Kactus2 caused the application to crash
+- Fixed an issue where editing AbstractionDefinition port properties affected all modes
+
 12/06/2018 3.6.0
 ----------------------------------------------------
 
diff --git a/Administrative/releaseFiles/setupx64.nsi b/Administrative/releaseFiles/setupx64.nsi
index 601d09dbf..352ab944d 100644
--- a/Administrative/releaseFiles/setupx64.nsi
+++ b/Administrative/releaseFiles/setupx64.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Kactus2"
-!define PRODUCT_VERSION "3.6.0 64-bit"
+!define PRODUCT_VERSION "3.6.50 64-bit"
 !define PRODUCT_PUBLISHER "TUT"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Kactus2.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
diff --git a/IPXACTmodels/AbstractionDefinition/validators/AbstractionDefinitionValidator.cpp b/IPXACTmodels/AbstractionDefinition/validators/AbstractionDefinitionValidator.cpp
index 2f1a1bf95..5f76b3c44 100644
--- a/IPXACTmodels/AbstractionDefinition/validators/AbstractionDefinitionValidator.cpp
+++ b/IPXACTmodels/AbstractionDefinition/validators/AbstractionDefinitionValidator.cpp
@@ -304,7 +304,7 @@ void AbstractionDefinitionValidator::findErrorsInPortAbstraction(QVector<QString
     QString context = QObject::tr("port %1").arg(port->getLogicalName());
 
     QStringList systemGroupNames;
-    QString busDefinitionIdentifier(":::");
+    QString busDefinitionIdentifier = QStringLiteral(":::");
     if (busDefinition)
     {
         systemGroupNames = busDefinition->getSystemGroupNames();