Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	ScreenPlayWindow/src/SPWmainwindow.cpp

ScreenPlay.pro

@@ -3,6 +3,6 @@ SUBDIRS =   \
     ScreenPlay/ScreenPlay.pro \
     ScreenPlaySDK/Screenplaysdk.pro \
     ScreenPlayWindow/ScreenPlayWindow.pro \
-    ScreenPlayWidget
+    ScreenPlayWidget/
 
 ScreenPlayWindow.depends = ScreenPlaySDK

ScreenPlay/ScreenPlay.pro

@@ -86,3 +86,13 @@ win32 {
     win32: LIBS += -L$$PWD/ThirdParty/Steam/redistributable_bin/win64/ -lsteam_api64
     DEPENDPATH += $$PWD/ThirdParty/Steam/redistributable_bin/win64
 }
+
+unix {
+    LIBS += -L$$PWD/ThirdParty/steam/redistributable_bin/linux64/ -lsteam_api
+    DEPENDPATH += $$PWD/ThirdParty/steam/redistributable_bin/linux64
+
+    INCLUDEPATH += $$PWD/ThirdParty/steam/lib/linux64
+    DEPENDPATH += $$PWD/ThirdParty/steam/lib/linux64s
+
+    LIBS += -L$$PWD/ThirdParty/steam/lib/linux64/ -lsdkencryptedappticket
+}

ScreenPlay/main.cpp

@@ -20,8 +20,10 @@
 #include <QVariant>
 #include <QWindow>
 #include <QtQuick/QQuickItem>
-#include <qt_windows.h>
 
+#ifdef Q_OS_WIN
+    #include <qt_windows.h>
+#endif
 #include "qmlutilities.h"
 #include "installedlistfilter.h"
 #include "installedlistmodel.h"

ScreenPlay/src/settings.cpp

@@ -234,10 +234,13 @@ void Settings::setScreenPlayWindowPath(const QUrl& screenPlayWindowPath)
 
 void Settings::checkForOtherFullscreenApplication()
 {
+#ifdef Q_OS_WIN
+
     HWND hWnd = GetForegroundWindow();
     RECT appBounds;
     RECT rc;
     GetWindowRect(GetDesktopWindow(), &rc);
+#endif
     //    if(hWnd =! (HWND)GetDesktopWindow() && hWnd != (HWND)GetShellWindow())
     //    {
     //        GetWindowRect(hWnd, &appBounds);

ScreenPlay/src/settings.h

@@ -28,8 +28,9 @@
 #include "projectsettingslistmodel.h"
 #include "sdkconnector.h"
 #include "steam/steam_api.h"
-#include "qt_windows.h"
-
+#ifdef Q_OS_WIN
+    #include <qt_windows.h>
+#endif
 /*!
     \class Settings
     \brief Used for:

ScreenPlayWindow/SPWmain.cpp

@@ -1,7 +1,9 @@
 #include "src/SPWmainwindow.h"
 #include <QApplication>
 #include <QStringList>
-#include "qt_windows.h"
+#ifdef Q_OS_WIN
+    #include <qt_windows.h>
+#endif
 
 int main(int argc, char* argv[])
 {

ScreenPlayWindow/src/SPWmainwindow.cpp

@@ -1,5 +1,5 @@
 #include "SPWmainwindow.h"
-
+#ifdef Q_OS_WIN
 BOOL WINAPI SearchForWorkerWindow(HWND hwnd, LPARAM lparam)
 {
     // 0xXXXXXXX "" WorkerW
@@ -12,11 +12,11 @@ BOOL WINAPI SearchForWorkerWindow(HWND hwnd, LPARAM lparam)
         *reinterpret_cast<HWND*>(lparam) = FindWindowExW(nullptr, hwnd, L"WorkerW", nullptr);
     return TRUE;
 }
-
+#endif
 MainWindow::MainWindow(int i, QString projectPath, QString id, QScreen* parent)
     : QWindow(parent)
 {
-
+#ifdef Q_OS_WIN
     setOpacity(0);
     m_projectPath = projectPath;
     m_appID = id;
@@ -120,14 +120,15 @@ MainWindow::MainWindow(int i, QString projectPath, QString id, QScreen* parent)
             emit playQmlScene(tmpPath);
         }
     }
+    #endif
 }
 void MainWindow::init()
 {
     setOpacity(0);
-    m_quickRenderer.data()->show();
+    #ifdef Q_OS_WIN
     ShowWindow(m_worker_hwnd, SW_SHOWDEFAULT);
     ShowWindow(m_hwnd, SW_SHOWDEFAULT);
-
+    #endif
     QPropertyAnimation* animation = new QPropertyAnimation(this, "opacity");
     animation->setDuration(200);
     //animation->setEasingCurve(QEasingCurve::OutCubic);
@@ -144,8 +145,10 @@ void MainWindow::destroyThis()
     animation->start();
 
     QObject::connect(animation, &QPropertyAnimation::finished, [&]() {
+        #ifdef Q_OS_WIN
         ShowWindow(m_worker_hwnd, SW_HIDE);
         ShowWindow(m_hwnd, SW_HIDE);
+        #endif
         QCoreApplication::quit();
     });
 }

ScreenPlayWindow/src/SPWmainwindow.h

@@ -1,6 +1,8 @@
 #pragma once
 
-#include "qt_windows.h"
+#ifdef Q_OS_WIN
+    #include <qt_windows.h>
+#endif
 #include <QApplication>
 #include <QDir>
 #include <QEasingCurve>
@@ -87,8 +89,10 @@ signals:
     void nameChanged(QString appID);
 
 private:
+    #ifdef Q_OS_WIN
     HWND m_hwnd;
     HWND m_worker_hwnd;
+    #endif
     QSharedPointer<QQuickView> m_quickRenderer = nullptr;
     QUrl m_projectPath;
     QString m_projectFile;