diff --git a/CMakeLists.txt b/CMakeLists.txt index b2c99d3e..eb81e5af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,6 +61,7 @@ execute_process( add_compile_definitions(COMPILE_INFO="${BUILD_DATE} + ${GIT_COMMIT_HASH}") add_compile_definitions(SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}") +add_compile_definitions(SCREENPLAY_STEAM="${SCREENPLAY_STEAM}") if(UNIX AND NOT APPLE) # Fixes QWebEngine linker errors on Ubuntu 20.04 diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index cc81a301..a50b8d5a 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -120,12 +120,8 @@ add_executable(${PROJECT_NAME} main.cpp) target_link_libraries(${PROJECT_NAME} PRIVATE ScreenPlayLib) qt5_add_translation(qmFiles ${l10n}) - - qt_add_big_resources(fonts fonts.qrc) -target_compile_definitions(${PROJECT_NAME} PRIVATE "GIT_VERSION=${GIT_VERSION}") - if(WIN32) # Icon target_sources(${PROJECT_NAME} PRIVATE ScreenPlay.rc) diff --git a/ScreenPlay/src/settings.cpp b/ScreenPlay/src/settings.cpp index f2f36464..39b56df6 100644 --- a/ScreenPlay/src/settings.cpp +++ b/ScreenPlay/src/settings.cpp @@ -51,6 +51,7 @@ Settings::Settings(const std::shared_ptr& globalVariables, setDesktopEnvironment(DesktopEnvironment::KDE); #endif + qRegisterMetaType("Settings::Language"); qRegisterMetaType("Settings::Theme"); qRegisterMetaType("Settings::DesktopEnvironment"); @@ -102,6 +103,7 @@ Settings::Settings(const std::shared_ptr& globalVariables, setupWidgetAndWindowPaths(); setGitBuildHash(COMPILE_INFO); + setSteamVersion((QString(SCREENPLAY_STEAM) == "OFF" ? false : true)); } /*!