diff --git a/backend_qt4/QtZint2.sln b/backend_qt4/QtZint2.sln
deleted file mode 100644
index 8a7c50cb..00000000
--- a/backend_qt4/QtZint2.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QtZint2", "QtZint2.vcproj", "{54ADAB01-7047-3ED1-B8D2-7AC84B1C5090}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {54ADAB01-7047-3ED1-B8D2-7AC84B1C5090}.Debug|Win32.ActiveCfg = Debug|Win32
- {54ADAB01-7047-3ED1-B8D2-7AC84B1C5090}.Debug|Win32.Build.0 = Debug|Win32
- {54ADAB01-7047-3ED1-B8D2-7AC84B1C5090}.Release|Win32.ActiveCfg = Release|Win32
- {54ADAB01-7047-3ED1-B8D2-7AC84B1C5090}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/backend_qt4/QtZint2.vcproj b/backend_qt4/QtZint2.vcproj
deleted file mode 100644
index ecc26286..00000000
--- a/backend_qt4/QtZint2.vcproj
+++ /dev/null
@@ -1,411 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend_qt4/qtZint.sln b/frontend_qt4/qtZint.sln
deleted file mode 100644
index 05c99e7e..00000000
--- a/frontend_qt4/qtZint.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qtZint", "qtZint.vcproj", "{6B8BFC0E-48F8-3D3B-BC6F-9EBEC23A8BC1}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {6B8BFC0E-48F8-3D3B-BC6F-9EBEC23A8BC1}.Debug|Win32.ActiveCfg = Debug|Win32
- {6B8BFC0E-48F8-3D3B-BC6F-9EBEC23A8BC1}.Debug|Win32.Build.0 = Debug|Win32
- {6B8BFC0E-48F8-3D3B-BC6F-9EBEC23A8BC1}.Release|Win32.ActiveCfg = Release|Win32
- {6B8BFC0E-48F8-3D3B-BC6F-9EBEC23A8BC1}.Release|Win32.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/frontend_qt4/qtZint.vcproj b/frontend_qt4/qtZint.vcproj
deleted file mode 100644
index ffb94b25..00000000
--- a/frontend_qt4/qtZint.vcproj
+++ /dev/null
@@ -1,499 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/zint.nsi b/zint.nsi
index 166ec24d..6ef348ef 100644
--- a/zint.nsi
+++ b/zint.nsi
@@ -10,7 +10,7 @@
;******************************************************************************
!define PRODUCT_NAME "Zint"
!define PRODUCT_EXE "qtZint.exe"
-!define PRODUCT_VERSION "2.3.0.0"
+!define PRODUCT_VERSION "2.4.0.0"
!define PRODUCT_WEB_SITE "http://www.zint.org.uk"
!define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}"
@@ -107,7 +107,6 @@ FunctionEnd
Section ${PRODUCT_NAME} SEC01
SectionIn RO
Call startInstall
-
SetOverwrite ifnewer
File ".\frontend_qt4\release\${PRODUCT_EXE}"
File ".\win32\Release\zint.exe"
@@ -116,16 +115,14 @@ Section ${PRODUCT_NAME} SEC01
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
- CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\qtZint.lnk" "$INSTDIR\${PRODUCT_EXE}"
+ CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Zint Barcode Studio.lnk" "$INSTDIR\${PRODUCT_EXE}"
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" "$INSTDIR\uninst.exe"
!insertmacro MUI_STARTMENU_WRITE_END
-
SectionEnd
;******************************************************************************
Section -Post
WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\${PRODUCT_EXE}"
WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "Path" "$INSTDIR"
-
WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayName" "${PRODUCT_NAME}"
WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
WriteRegStr SHCTX "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_EXE}"
@@ -191,7 +188,6 @@ Section Uninstall
Delete /REBOOTOK "$INSTDIR\uninst.exe"
Delete /REBOOTOK "$INSTDIR\install.log"
RmDir /REBOOTOK "$INSTDIR"
-
SectionEnd
;******************************************************************************
VIProductVersion ${PRODUCT_VERSION}
@@ -199,7 +195,7 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${PRODUCT_NAME}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${PRODUCT_PUBLISHER}"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "${PRODUCT_NAME} Setup"
VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${PRODUCT_VERSION}"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright © 2009 Robin Stuart & BogDan Vatra"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright © 2010 Robin Stuart & BogDan Vatra"
VIAddVersionKey /LANG=${LANG_ENGLISH} "License" "GNU General Public License version 3"
VIAddVersionKey /LANG=${LANG_ENGLISH} "WWW" "${PRODUCT_WEB_SITE}"
;******************************************************************************