From 6299e1e7dd4d012d297f5c7af9805a2894bbd455 Mon Sep 17 00:00:00 2001
From: Elias <i@kelteseth.net>
Date: Sat, 27 Jul 2019 11:36:33 +0200
Subject: [PATCH] Fix ci

Fix exe icon
Fix Qt version to 5.13
---
 ScreenPlay/ScreenPlay.pro    | 4 ++++
 ScreenPlayWallpaper/main.cpp | 6 +++---
 scripts/build.bat            | 2 +-
 scripts/package.bat          | 8 ++++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ScreenPlay/ScreenPlay.pro b/ScreenPlay/ScreenPlay.pro
index b4c7638d..650a01a5 100644
--- a/ScreenPlay/ScreenPlay.pro
+++ b/ScreenPlay/ScreenPlay.pro
@@ -31,6 +31,7 @@ SOURCES += main.cpp \
     src/create.cpp
 
 
+
 TRANSLATIONS =  translations/ScreenPlay_en.ts   \
                 translations/ScreenPlay_de.ts
 
@@ -69,6 +70,9 @@ INCLUDEPATH += $$PWD/../Common/vcpkg/installed/x64-windows/include
 DEPENDPATH += $$PWD/../Common/vcpkg/installed/x64-windows/include
 
 win32 {
+    RC_ICONS += favicon.ico
+
+
     LIBS += -L$$PWD/../Common/vcpkg/installed/x64-windows/lib/ -llibzippp
 CONFIG(debug, debug|release) {
     install_it.files += $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/zip.dll \
diff --git a/ScreenPlayWallpaper/main.cpp b/ScreenPlayWallpaper/main.cpp
index b7982cd8..fd612545 100644
--- a/ScreenPlayWallpaper/main.cpp
+++ b/ScreenPlayWallpaper/main.cpp
@@ -24,7 +24,6 @@ int main(int argc, char* argv[])
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 
     QApplication app(argc, argv);
-
     // This gives us nice clickable output in QtCreator
     qSetMessagePattern("%{if-category}%{category}: %{endif}%{message}\n   Loc: [%{file}:%{line}]");
 
@@ -37,9 +36,10 @@ int main(int argc, char* argv[])
     if (argumentList.length() == 1) {
         QVector<int> list;
         list.append(0);
+
 #if defined(Q_OS_WIN)
-        //WinWindow window(list, "test", "appid", "1");
-        WinWindow window(list, "D:/672870/827874818", "appid", "1");
+        WinWindow window(list, "test", "appid", "1");
+        //WinWindow window(list, "D:/672870/827874818", "appid", "1");
 #endif
 #if defined(Q_OS_LINUX)
         LinuxWindow window(list, "test", "appid", "1");
diff --git a/scripts/build.bat b/scripts/build.bat
index 233044d6..8bd68349 100644
--- a/scripts/build.bat
+++ b/scripts/build.bat
@@ -1,7 +1,7 @@
 setlocal EnableExtensions
 
 set PATH=%PATH%;C:\Qt\Tools\QtCreator\bin
-set PATH=%PATH%;C:\Qt\5.12.0\msvc2017_64\bin
+set PATH=%PATH%;C:\Qt\5.13.0\msvc2017_64\bin
 set root=%cd%
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat"
diff --git a/scripts/package.bat b/scripts/package.bat
index 284cac10..d39909a4 100644
--- a/scripts/package.bat
+++ b/scripts/package.bat
@@ -1,7 +1,7 @@
 setlocal EnableExtensions
 
 set PATH=%PATH%;C:\Qt\Tools\QtCreator\bin
-set PATH=%PATH%;C:\Qt\5.12.0\msvc2017_64\bin
+set PATH=%PATH%;C:\Qt\5.13.0\msvc2017_64\bin
 set root=%cd%
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat"
@@ -17,13 +17,13 @@ echo "Copy ScreenPlaySDK"
 xcopy /s /y ScreenPlaySDK\release ..\PACKAGE
 echo "Copy ScreenPlayWidget"
 xcopy /s /y ScreenPlayWidget\release ..\PACKAGE
-echo "Copy ScreenPlayWindow"
-xcopy /s /y ScreenPlayWindow\release ..\PACKAGE
+echo "Copy ScreenPlayWallpaper"
+xcopy /s /y ScreenPlayWallpaper\release ..\PACKAGE
 
 cd ..
 
 windeployqt.exe  --release  --qmldir ScreenPlay/qml PACKAGE/ScreenPlay.exe
-windeployqt.exe  --release  --qmldir ScreenPlayWindow/qml PACKAGE/ScreenPlayWindow.exe
+windeployqt.exe  --release  --qmldir ScreenPlayWallpaper/qml PACKAGE/ScreenPlayWallpaper.exe
 
 cd PACKAGE