diff --git a/ScreenPlay/qml/Installed/Installed.qml b/ScreenPlay/qml/Installed/Installed.qml index fbb11b8c..a5b573e5 100644 --- a/ScreenPlay/qml/Installed/Installed.qml +++ b/ScreenPlay/qml/Installed/Installed.qml @@ -150,7 +150,7 @@ Item { //Pull to refresh if (contentY <= -180 && !refresh && !isDragging) { installedListModel.reset() - installedListModel.loadScreens() + installedListModel.loadInstalledContent() } } diff --git a/ScreenPlay/src/sdkconnector.h b/ScreenPlay/src/sdkconnector.h index 33eb18da..a2761e39 100644 --- a/ScreenPlay/src/sdkconnector.h +++ b/ScreenPlay/src/sdkconnector.h @@ -41,7 +41,7 @@ class SDKConnection : public QObject { Q_PROPERTY(QVector monitor READ monitor WRITE setMonitor NOTIFY monitorChanged) public: - explicit SDKConnection(QLocalSocket* socket, QObject* parent = nullptr) + explicit SDKConnection(QLocalSocket* socket, QObject* parent = nullptr) : QObject(parent) { m_socket = socket; diff --git a/ScreenPlay/src/settings.cpp b/ScreenPlay/src/settings.cpp index 497928c0..55639d55 100644 --- a/ScreenPlay/src/settings.cpp +++ b/ScreenPlay/src/settings.cpp @@ -364,7 +364,7 @@ void Settings::setupWidgetAndWindowPaths() if (QDir(SPWorkingDir.path() + "/release").exists()) { // If started by QtCreator SPWorkingDir.cd("release"); - settings.setScreenPlayWindowPath(QUrl(SPWorkingDir.path() + "/ScreenPlayWindow.exe")); + setScreenPlayWindowPath(QUrl(SPWorkingDir.path() + "/ScreenPlayWindow.exe")); SPWorkingDir.cdUp(); SPWorkingDir.cdUp(); SPWorkingDir.cd("ScreenPlayWidget"); diff --git a/WinDeploy.sh b/WinDeploy.sh deleted file mode 100644 index 2e7b9be9..00000000 --- a/WinDeploy.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -QtPath='C:/Qt/5.11.1/msvc2017_64/bin' -QtCreatorPath='C:\Qt\Tools\QtCreator\bin' -ReleasePath='C:\Users\Eli\Code\Qt\build-ScreenPlay-Desktop_Qt_5_11_1_MSVC2017_64bit-Release/ScreenPlay/release/' -DeployPath='C:/Users/Eli/Code/Qt/ScreenPlay-Deploy/' -SourcePath=$PWD -SteamSDK='ScreenPlay/ThirdParty/steam/redistributable_bin/win64/' - - -echo 'This is script will now copy' -echo 'all depenecies into the release folder' -echo '' - -echo 'Generating folder structure' -cd $ReleasePath -if [ ! -d $DeployPath ] -then - mkdir $DeployPath -fi -if [ ! -d $DeployPath'ScreenPlay' ] -then - mkdir $DeployPath'ScreenPlay' -fi -if [ ! -d $DeployPath'ScreenPlaySDK' ] -then - mkdir $DeployPath'ScreenPlaySDK' -fi - -rm *.obj -rm *.cpp -rm *.o - -echo 'Copying files from Release to Deploy path' -cp -r ./* $DeployPath'ScreenPlay' - -cd .. -cd .. -cd 'ScreenPlaySDK' - -cp 'qmldir' $DeployPath'ScreenPlaySDK' -cd 'release' -rm *.obj -rm *.cpp -rm *.o -cp -r ./* $DeployPath'ScreenPlaySDK' - -cd .. -cd .. -cd 'ScreenPlayWindow' -cd 'release' -rm *.obj -rm *.cpp -rm *.o -cp -r ./* $DeployPath'ScreenPlay' - -cd .. -cd .. -cd 'ScreenPlayWidget' -cd 'release' -rm *.obj -rm *.cpp -rm *.o -cp -r ./* $DeployPath'ScreenPlay' - - -echo '' -echo 'Deploying Steam SDK' -cp $SourcePath'/'$SteamSDK'steam_api64.dll' $DeployPath'ScreenPlay' -cp $SourcePath'/'$SteamSDK'steam_api64.lib' $DeployPath'ScreenPlay' -cp $SourcePath'/ScreenPlay/''steam_appid.txt' $DeployPath'ScreenPlay' -cp -R $SourcePath'/ScreenPlay/legal/' $DeployPath'ScreenPlay/' - -echo 'Copying OpenSSL from QtCreator' -cp $QtCreatorPath'/libeay32.dll' $DeployPath'ScreenPlay' -cp $QtCreatorPath'/ssleay32.dll' $DeployPath'ScreenPlay' - - -echo '' -echo 'Deploying QtDLLs via windeployqt.exe' -qtDeployPath=' --release --qmldir '$SourcePath' '$DeployPath'/ScreenPlay/ScreenPlay.exe' -echo 'Loading please wait!' -exec $QtPath'/'windeployqt.exe $qtDeployPath - -echo 'press any button to exit <3' -read sads \ No newline at end of file diff --git a/scripts/build.bat b/scripts/build.bat index 38794df2..233044d6 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.11.2\msvc2017_64\bin +set PATH=%PATH%;C:\Qt\5.12.0\msvc2017_64\bin set root=%cd% call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat"