Finalize Win Build including instructions and setup script

backend_qt/backend_qt.pro

@@ -21,9 +21,6 @@ INCLUDEPATH += ../backend
 #EDIT THIS !!!!
 DEFINES += ZINT_VERSION="\\\"2.5.0\\\""
 
-# Win
-DEFINES += NO_PNG
-
 !contains(DEFINES, NO_PNG) {
     INCLUDEPATH += ../../lpng
     INCLUDEPATH += ../../zlib

frontend_qt/Inno_Setup_qtzint.iss

@@ -0,0 +1,51 @@
+; Script generated by the Inno Script Studio Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "qtZint"
+#define MyAppVersion "2.5.1"
+#define MyAppPublisher "Robin Stuart"
+#define MyAppURL "http://zint.org.uk/"
+#define MyAppExeName "qtZint.exe"
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{51A55206-3370-498A-9DFC-0FCAEA98278D}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+AllowNoIcons=yes
+LicenseFile=..\COPYING
+OutputDir=.
+OutputBaseFilename=zint{#MyAppVersion}_win_setup
+Compression=lzma
+SolidCompression=yes
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked; OnlyBelowVersion: 0,6.1
+
+[Files]
+Source: "release\qtZint.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "release\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "release\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "release\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: quicklaunchicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

frontend_qt/frontend_qt.pro

@@ -4,7 +4,8 @@ DEPENDPATH += . debug release
 INCLUDEPATH += .
 QT += gui
 QT += uitools
-DEFINES += NO_PNG
+QT += widgets
+QT += uitools
 
 # Input
 HEADERS += barcodeitem.h \
@@ -51,7 +52,7 @@ RESOURCES += resources.qrc
 # Static target following http://qt-project.org/wiki/Build_Standalone_Qt_Application_for_Windows
 CONFIG += static
 
-CONFIG += warn_on thread qt uitools
+CONFIG += warn_on thread qt
 
 INCLUDEPATH += ../backend_qt ../backend
 
@@ -60,9 +61,9 @@ QMAKE_LIBDIR += ../backend_qt/release
 
 !contains(DEFINES, NO_PNG) {
 # Win
-    LIBS += -llibpng -zlib
+    win32:LIBS += -llibpng16 -zlib
-    QMAKE_LIBDIR+=../../lpng/projects/visualc71_converted_to_9/Win32_LIB_Release ../../lpng/projects/visualc71_converted_to_9/Win32_LIB_Release/zlib
+    win32:QMAKE_LIBDIR+="../../lpng/projects/vstudio/Release Library"
 # Unix
-    #LIBS += -lpng -zlib
+    unix:LIBS += -lpng -zlib
-    #QMAKE_LIBDIR += /usr/local/lib /usr/lib/x86_64-linux-gnu/
+    unix:QMAKE_LIBDIR += /usr/local/lib /usr/lib/x86_64-linux-gnu/
 }

frontend_qt/howto_build_qzint_using_msvs2015.txt

@@ -1,8 +1,11 @@
 Harald Oehlmann
-2016-02-28
+2017-01-18
+
+(does not run jet, NO_PNG mandatory as png/zlib not in 64 bit)
 
 How to build qzint.exe using:
-- QT 5.7 installed in C:\qt5
+- QT 5.7 installed in C:\qt\Qt5.7.1
+  32 bit (use the offline installer and the 32 bit package)
 - MS Visual Studio 2015 (VC12)
 
 Folder structure:
@@ -13,10 +16,15 @@ Folder structure:
 - zlib128.zip unzipped in folder $ZH\..\zlib
   -> $ZH\..\zlib\zlib.h exists
 
+Build libpng:
+Open $ZH\..\lpng\projects\vstudio with VS2015 gui and convert the project
+Copy the zlib source as required by the make file (in my case: zlib-1.2.8)
+Build targets "Release Library" for zlib and libpng.
+
 Build zint
 
 - Start in the start menu: "VS2015 x64 Native Tools-Eingabeaufforderung"
-- set PATH=C:\Qt5\5.7\msvc2015_64\bin;%PATH%
+- set PATH=C:\Qt\Qt5.7.1\5.7\msvc2015\bin;%PATH%
 - cd $ZH
 - cd backend_qt
 - qmake backend_qt.pro
@@ -28,3 +36,10 @@ Build zint
 - nmake clean
 - nmake release
   -> qzint.exe is in the release folder
+
+For me, it only runs, if I add the following files in the folder (from the QT bin folder):
+Qt5Core.dll
+Qt5Gui.dll
+Qt5Widgets.dll
+
+InnoSetup Studio may be used to build the setup file.

frontend_qt/howto_build_qzint_using_msvs9.txt

@@ -1,55 +0,0 @@
-Harald Oehlmann
-2016-02-28
-
-How to build qzint.exe using:
-- QT 4
-- MS Visual Studio 2008 (VC9)
-
-Folder structure:
-- zint source files in $ZH
-  -> this file is in $ZH\frontend_qt4
-- png1620.zip unzipped in $ZH\..\lpng
-  -> $ZH\..\lpng\png.h exists
-- zlib128.zip inzipped in folder $ZH\..\zlib
-  -> $ZH\..\zlib\zlib.h exists
-
-Prepare qt for static build
-
-- Start "Visual Studio 2008 Command Line" (or execute "%VS90COMNTOOLS%vsvars32.bat" )
-- cd c:\qt\4.8.6
-- configure -static -release -qt-zlib  -qt-libpng -qt-libjpeg
-- nmake
-  -> took around 2 hours for me
-
-Build pnglib and zlib
-- cd $ZH\..\lpng\projects
-- copy visual71 visual71_converted_to_9
-- Start Visual Studio 2..8 (CV9)
-- open Project: $ZH\..\lpng\projects\visualc71_converted_to_9\libpng.sln
-- convert it as proposed by the IDE (no backup, we have made a copy before)
-- select "LIB Release" configuration
-- go to project "libpng" and open project options (ALT-F7)
-- On the left, select "C/C++->Code generation"
-- On the right change "Run time library" from "Multi-Treaded (/MT)" to "Multithread-DLL (/MD)"
-- also do the upper steps for the project "zlib" (change /MT to /MD)
-- Build libpng and zlib project using the Buildall menu entry
-  -> this compiles png in the static lib:
-   lpng\projects\visualc71_converted_to_9\Win32_LIB_Release\libpng.lib
-   and zlib into the static lib
-   lpng\projects\visualc71_converted_to_9\Win32_LIB_Release\zlib\zlib.lib
-
-Build zint
-
-- Start "Visual Studio 2008 Command Line" (or execute "%VS90COMNTOOLS%vsvars32.bat" )
-- C:\Qt\4.8.6\bin\qtvars.bat
-- cd $ZH
-- cd backend_qt4
-- qmake backend_qt4.pro
-- nmake clean
-- nmake release
-    
-- cd ..\frontend_qt4
-- qmake frontend_qt4.pro
-- nmake clean
-- nmake release
-  -> qzint.exe is in the release folder