Fix for #159 (#163)

Fixes #159

Author: Gemba

src/zxinfodk.cpp

@@ -28,7 +28,6 @@
 #include "zxinfodk.h"
 
 #include "gameentry.h"
-#include "strtools.h"
 
 #include <QDebug>
 #include <QJsonArray>
@@ -38,7 +37,7 @@
 #include <QStringBuilder>
 
 static const QList<QPair<QString, QString>>
-    headers({QPair(QString("User-Agent"), QString("Skyscraper / ").append(VERSION))});
+    headers({QPair<QString, QString>("User-Agent", "Skyscraper / " VERSION)});
 static const QString mediaUrl = "https://zxinfo.dk/media";
 
 ZxInfoDk::ZxInfoDk(Settings *config, QSharedPointer<NetManager> manager)

win32/skyscraper.pro

@@ -18,28 +18,28 @@ win32 {
   VERSION=$$replace(VERSION, '-dev', '.999')
 
   # remove build artifacts
-  QMAKE_POST_LINK += cmd /c del $$shell_quote($$shell_path($${DEST}\\\\*.cpp)) \
-    $$shell_quote($$shell_path($${DEST}\\\\*.o)) \
-    $$shell_quote($$shell_path($${DEST}\\\\*.h)) $$escape_expand(\\n\\t)
+  QMAKE_POST_LINK += cmd /c del $$system_quote($$system_path($${DEST}\\\\*.cpp)) \
+    $$system_quote($$system_path($${DEST}\\\\*.o)) \
+    $$system_quote($$system_path($${DEST}\\\\*.h)) $$escape_expand(\\n\\t)
 
   # copy licenses
-  QMAKE_POST_LINK += cmd /c copy /y $$shell_quote($$shell_path($${PWD}/../LICENSE)) \
-    $$shell_quote($$shell_path($${DEST}/LICENSE.Skyscraper)) $$escape_expand(\\n\\t)
-  QMAKE_POST_LINK += cmd /c copy /y $$shell_quote($$shell_path($${QT_LIC_FOLDER}/LICENSE)) \
-    $$shell_quote($$shell_path($${DEST})) $$escape_expand(\\n\\t)
-  QMAKE_POST_LINK += cmd /c copy /y $$shell_quote($$shell_path($${QT_LIC_FOLDER}/LICENSE.GPL3-EXCEPT)) \
-    $$shell_quote($$shell_path($${DEST})) $$escape_expand(\\n\\t)
+  QMAKE_POST_LINK += cmd /c copy /y $$system_quote($$system_path($${PWD}/../LICENSE)) \
+    $$system_quote($$system_path($${DEST}/LICENSE.Skyscraper)) $$escape_expand(\\n\\t)
+  QMAKE_POST_LINK += cmd /c copy /y $$system_quote($$system_path($${QT_LIC_FOLDER}/LICENSE)) \
+    $$system_quote($$system_path($${DEST})) $$escape_expand(\\n\\t)
+  QMAKE_POST_LINK += cmd /c copy /y $$system_quote($$system_path($${QT_LIC_FOLDER}/LICENSE.GPL3-EXCEPT)) \
+    $$system_quote($$system_path($${DEST})) $$escape_expand(\\n\\t)
 
   # determine needed libs and copy into $${DEST}
-  QMAKE_POST_LINK += cmd /c $$shell_quote($$shell_path($${WINDEPLOYQT_BIN})) \
+  QMAKE_POST_LINK += cmd /c $$system_quote($$system_path($${WINDEPLOYQT_BIN})) \
     --no-system-dxc-compiler --no-system-d3d-compiler --no-opengl-sw \
-    $$shell_quote($$shell_path($${DEST}\\Skyscraper.exe)) \
+    $$system_quote($$system_path($${DEST}\\Skyscraper.exe)) \
     $$escape_expand(\\n\\t)
 
   # create mandatory folders and deploy mandatory files
-  QMAKE_POST_LINK += powershell -Command "md -Force '$$shell_path($$(USERPROFILE)/RetroPie/roms)'" > NUL &
+  QMAKE_POST_LINK += powershell -Command "md -Force '$$system_path($$(USERPROFILE)/RetroPie/roms)'" > NUL &
   QMAKE_POST_LINK += powershell -NoProfile -NoLogo -NonInteractive -ExecutionPolicy Bypass \
-    -File $$shell_quote($$shell_path($${PWD}/deploy_mandatory_files.ps1)) \
-    $$shell_quote($${PWD}/..) $$shell_quote($$shell_path($$(USERPROFILE)/.skyscraper)) \
+    -File $$system_quote($$system_path($${PWD}/deploy_mandatory_files.ps1)) \
+    $$system_quote($${PWD}/..) $$system_quote($$system_path($$(USERPROFILE)/.skyscraper)) \
     $$escape_expand(\\n\\t)
 }