From 50f198050d8c4cae89564a81883c2570f092aeff Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Sat, 23 Apr 2022 18:00:12 +0200 Subject: [PATCH] Fix tst_ScreenPlay --- ScreenPlay/CMakeLists.txt | 55 +++++++++++-------- ScreenPlay/{ => inc/public/ScreenPlay}/app.h | 20 +++---- .../{src => inc/public/ScreenPlay}/create.h | 6 +- .../public/ScreenPlay}/createimportstates.h | 0 .../public/ScreenPlay}/createimportvideo.h | 4 +- .../public/ScreenPlay}/globalvariables.h | 0 .../public/ScreenPlay}/installedlistfilter.h | 4 +- .../public/ScreenPlay}/installedlistmodel.h | 6 +- .../public/ScreenPlay}/monitorlistmodel.h | 6 +- .../{src => inc/public/ScreenPlay}/profile.h | 0 .../public/ScreenPlay}/profilelistmodel.h | 4 +- .../ScreenPlay}/projectsettingslistitem.h | 0 .../ScreenPlay}/projectsettingslistmodel.h | 2 +- .../public/ScreenPlay}/screenplaymanager.h | 0 .../public/ScreenPlay}/screenplaywallpaper.h | 10 ++-- .../public/ScreenPlay}/screenplaywidget.h | 6 +- .../public/ScreenPlay}/sdkconnection.h | 4 +- .../{src => inc/public/ScreenPlay}/settings.h | 4 +- .../{src => inc/public/ScreenPlay}/util.h | 2 +- .../{src => inc/public/ScreenPlay}/wizards.h | 6 +- ScreenPlay/main.cpp | 2 +- ScreenPlay/{ => src}/app.cpp | 2 +- ScreenPlay/src/create.cpp | 2 +- ScreenPlay/src/createimportvideo.cpp | 2 +- ScreenPlay/src/globalvariables.cpp | 2 +- ScreenPlay/src/installedlistfilter.cpp | 2 +- ScreenPlay/src/installedlistmodel.cpp | 2 +- ScreenPlay/src/monitorlistmodel.cpp | 2 +- ScreenPlay/src/profilelistmodel.cpp | 2 +- ScreenPlay/src/projectsettingslistmodel.cpp | 2 +- ScreenPlay/src/screenplaymanager.cpp | 2 +- ScreenPlay/src/screenplaywallpaper.cpp | 2 +- ScreenPlay/src/screenplaywidget.cpp | 2 +- ScreenPlay/src/sdkconnection.cpp | 2 +- ScreenPlay/src/settings.cpp | 2 +- ScreenPlay/src/util.cpp | 2 +- ScreenPlay/src/wizards.cpp | 2 +- ScreenPlay/tests/tst_main.cpp | 8 +-- ScreenPlayShader/CMakeLists.txt | 10 ++-- ScreenPlayUtil/qml/Dialogs/CriticalError.qml | 2 +- ScreenPlayWorkshop/CMakeLists.txt | 15 +++-- 41 files changed, 106 insertions(+), 102 deletions(-) rename ScreenPlay/{ => inc/public/ScreenPlay}/app.h (95%) rename ScreenPlay/{src => inc/public/ScreenPlay}/create.h (97%) rename ScreenPlay/{src => inc/public/ScreenPlay}/createimportstates.h (100%) rename ScreenPlay/{src => inc/public/ScreenPlay}/createimportvideo.h (98%) rename ScreenPlay/{src => inc/public/ScreenPlay}/globalvariables.h (100%) rename ScreenPlay/{src => inc/public/ScreenPlay}/installedlistfilter.h (96%) rename ScreenPlay/{src => inc/public/ScreenPlay}/installedlistmodel.h (97%) rename ScreenPlay/{src => inc/public/ScreenPlay}/monitorlistmodel.h (96%) rename ScreenPlay/{src => inc/public/ScreenPlay}/profile.h (100%) rename ScreenPlay/{src => inc/public/ScreenPlay}/profilelistmodel.h (97%) rename ScreenPlay/{src => inc/public/ScreenPlay}/projectsettingslistitem.h (100%) rename ScreenPlay/{src => inc/public/ScreenPlay}/projectsettingslistmodel.h (99%) rename ScreenPlay/{src => inc/public/ScreenPlay}/screenplaymanager.h (100%) rename ScreenPlay/{src => inc/public/ScreenPlay}/screenplaywallpaper.h (97%) rename ScreenPlay/{src => inc/public/ScreenPlay}/screenplaywidget.h (97%) rename ScreenPlay/{src => inc/public/ScreenPlay}/sdkconnection.h (98%) rename ScreenPlay/{src => inc/public/ScreenPlay}/settings.h (99%) rename ScreenPlay/{src => inc/public/ScreenPlay}/util.h (99%) rename ScreenPlay/{src => inc/public/ScreenPlay}/wizards.h (97%) rename ScreenPlay/{ => src}/app.cpp (99%) diff --git a/ScreenPlay/CMakeLists.txt b/ScreenPlay/CMakeLists.txt index 63ff1238..2398dbb8 100644 --- a/ScreenPlay/CMakeLists.txt +++ b/ScreenPlay/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_AUTORCC ON) set(CMAKE_AUTOMOC ON) set(SOURCES - app.cpp + src/app.cpp src/create.cpp src/createimportvideo.cpp src/globalvariables.cpp @@ -23,24 +23,24 @@ set(SOURCES src/wizards.cpp) set(HEADER - app.h - src/create.h - src/createimportstates.h - src/createimportvideo.h - src/globalvariables.h - src/installedlistfilter.h - src/installedlistmodel.h - src/monitorlistmodel.h - src/profile.h - src/profilelistmodel.h - src/projectsettingslistmodel.h - src/screenplaymanager.h - src/screenplaywallpaper.h - src/screenplaywidget.h - src/sdkconnection.h - src/settings.h - src/util.h - src/wizards.h) + inc/public/ScreenPlay/app.h + inc/public/ScreenPlay/create.h + inc/public/ScreenPlay/createimportstates.h + inc/public/ScreenPlay/createimportvideo.h + inc/public/ScreenPlay/globalvariables.h + inc/public/ScreenPlay/installedlistfilter.h + inc/public/ScreenPlay/installedlistmodel.h + inc/public/ScreenPlay/monitorlistmodel.h + inc/public/ScreenPlay/profile.h + inc/public/ScreenPlay/profilelistmodel.h + inc/public/ScreenPlay/projectsettingslistmodel.h + inc/public/ScreenPlay/screenplaymanager.h + inc/public/ScreenPlay/screenplaywallpaper.h + inc/public/ScreenPlay/screenplaywidget.h + inc/public/ScreenPlay/sdkconnection.h + inc/public/ScreenPlay/settings.h + inc/public/ScreenPlay/util.h + inc/public/ScreenPlay/wizards.h) set(QML main.qml @@ -141,6 +141,11 @@ add_library( ${RESOURCES} ${FONTS}) +target_include_directories( + ScreenPlayLib + PUBLIC inc/public/ + PRIVATE src/) + target_link_libraries( ScreenPlayLib PUBLIC ScreenPlaySDK @@ -158,10 +163,17 @@ target_link_libraries( ScreenPlayWorkshopplugin ScreenPlayWorkshop SteamSDKQtEnums) +target_include_directories(ScreenPlayLib PUBLIC ) qt_add_executable(${PROJECT_NAME} main.cpp) target_link_libraries(${PROJECT_NAME} PRIVATE ScreenPlayLib) +if(${SCREENPLAY_TESTS}) + add_executable(tst_ScreenPlay tests/tst_main.cpp) + target_link_libraries(tst_ScreenPlay PRIVATE ScreenPlayLib Qt6::Test) +endif() + + set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/translations") # qt_add_lupdate does not work for some reason. Lets do it manually: @@ -188,11 +200,6 @@ qt_add_qml_module( QML_FILES ${QML}) -#if(${SCREENPLAY_TESTS}) -# add_executable(tst_ScreenPlay tests/tst_main.cpp) -# target_link_libraries(tst_ScreenPlay PRIVATE ScreenPlayLib Qt6::Test) -#endif() - if(WIN32) # Icon target_sources(${PROJECT_NAME} PRIVATE ScreenPlay.rc) diff --git a/ScreenPlay/app.h b/ScreenPlay/inc/public/ScreenPlay/app.h similarity index 95% rename from ScreenPlay/app.h rename to ScreenPlay/inc/public/ScreenPlay/app.h index 342d3ce8..3db30cb3 100644 --- a/ScreenPlay/app.h +++ b/ScreenPlay/inc/public/ScreenPlay/app.h @@ -49,16 +49,16 @@ #include #include -#include "src/create.h" -#include "src/globalvariables.h" -#include "src/installedlistfilter.h" -#include "src/installedlistmodel.h" -#include "src/monitorlistmodel.h" -#include "src/profilelistmodel.h" -#include "src/screenplaymanager.h" -#include "src/settings.h" -#include "src/util.h" -#include "src/wizards.h" +#include "ScreenPlay/create.h" +#include "ScreenPlay/globalvariables.h" +#include "ScreenPlay/installedlistfilter.h" +#include "ScreenPlay/installedlistmodel.h" +#include "ScreenPlay/monitorlistmodel.h" +#include "ScreenPlay/profilelistmodel.h" +#include "ScreenPlay/screenplaymanager.h" +#include "ScreenPlay/settings.h" +#include "ScreenPlay/util.h" +#include "ScreenPlay/wizards.h" #include #include diff --git a/ScreenPlay/src/create.h b/ScreenPlay/inc/public/ScreenPlay/create.h similarity index 97% rename from ScreenPlay/src/create.h rename to ScreenPlay/inc/public/ScreenPlay/create.h index 739493af..e09bbcdc 100644 --- a/ScreenPlay/src/create.h +++ b/ScreenPlay/inc/public/ScreenPlay/create.h @@ -57,9 +57,9 @@ #include #include "ScreenPlayUtil/util.h" -#include "createimportvideo.h" -#include "globalvariables.h" -#include "util.h" +#include "ScreenPlay/createimportvideo.h" +#include "ScreenPlay/globalvariables.h" +#include "ScreenPlay/util.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/createimportstates.h b/ScreenPlay/inc/public/ScreenPlay/createimportstates.h similarity index 100% rename from ScreenPlay/src/createimportstates.h rename to ScreenPlay/inc/public/ScreenPlay/createimportstates.h diff --git a/ScreenPlay/src/createimportvideo.h b/ScreenPlay/inc/public/ScreenPlay/createimportvideo.h similarity index 98% rename from ScreenPlay/src/createimportvideo.h rename to ScreenPlay/inc/public/ScreenPlay/createimportvideo.h index 5aa50c9b..adc35275 100644 --- a/ScreenPlay/src/createimportvideo.h +++ b/ScreenPlay/inc/public/ScreenPlay/createimportvideo.h @@ -49,8 +49,8 @@ #include #include -#include "createimportstates.h" -#include "util.h" +#include "ScreenPlay/createimportstates.h" +#include "ScreenPlay/util.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/globalvariables.h b/ScreenPlay/inc/public/ScreenPlay/globalvariables.h similarity index 100% rename from ScreenPlay/src/globalvariables.h rename to ScreenPlay/inc/public/ScreenPlay/globalvariables.h diff --git a/ScreenPlay/src/installedlistfilter.h b/ScreenPlay/inc/public/ScreenPlay/installedlistfilter.h similarity index 96% rename from ScreenPlay/src/installedlistfilter.h rename to ScreenPlay/inc/public/ScreenPlay/installedlistfilter.h index ba4c9bb0..1f723e27 100644 --- a/ScreenPlay/src/installedlistfilter.h +++ b/ScreenPlay/inc/public/ScreenPlay/installedlistfilter.h @@ -38,8 +38,8 @@ #include #include -#include "globalvariables.h" -#include "installedlistmodel.h" +#include "ScreenPlay/globalvariables.h" +#include "ScreenPlay/installedlistmodel.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/installedlistmodel.h b/ScreenPlay/inc/public/ScreenPlay/installedlistmodel.h similarity index 97% rename from ScreenPlay/src/installedlistmodel.h rename to ScreenPlay/inc/public/ScreenPlay/installedlistmodel.h index c552675a..f1efbb2c 100644 --- a/ScreenPlay/src/installedlistmodel.h +++ b/ScreenPlay/inc/public/ScreenPlay/installedlistmodel.h @@ -55,9 +55,9 @@ #include #include "ScreenPlayUtil/projectfile.h" -#include "globalvariables.h" -#include "profilelistmodel.h" -#include "util.h" +#include "ScreenPlay/globalvariables.h" +#include "ScreenPlay/profilelistmodel.h" +#include "ScreenPlay/util.h" #include diff --git a/ScreenPlay/src/monitorlistmodel.h b/ScreenPlay/inc/public/ScreenPlay/monitorlistmodel.h similarity index 96% rename from ScreenPlay/src/monitorlistmodel.h rename to ScreenPlay/inc/public/ScreenPlay/monitorlistmodel.h index 24adcd06..a75a843d 100644 --- a/ScreenPlay/src/monitorlistmodel.h +++ b/ScreenPlay/inc/public/ScreenPlay/monitorlistmodel.h @@ -43,9 +43,9 @@ #include #include -#include "projectsettingslistmodel.h" -#include "screenplaywallpaper.h" -#include "screenplaywidget.h" +#include "ScreenPlay/projectsettingslistmodel.h" +#include "ScreenPlay/screenplaywallpaper.h" +#include "ScreenPlay/screenplaywidget.h" #ifdef Q_OS_WIN #include diff --git a/ScreenPlay/src/profile.h b/ScreenPlay/inc/public/ScreenPlay/profile.h similarity index 100% rename from ScreenPlay/src/profile.h rename to ScreenPlay/inc/public/ScreenPlay/profile.h diff --git a/ScreenPlay/src/profilelistmodel.h b/ScreenPlay/inc/public/ScreenPlay/profilelistmodel.h similarity index 97% rename from ScreenPlay/src/profilelistmodel.h rename to ScreenPlay/inc/public/ScreenPlay/profilelistmodel.h index 90945b13..f61d1229 100644 --- a/ScreenPlay/src/profilelistmodel.h +++ b/ScreenPlay/inc/public/ScreenPlay/profilelistmodel.h @@ -43,8 +43,8 @@ #include #include -#include "globalvariables.h" -#include "profile.h" +#include "ScreenPlay/globalvariables.h" +#include "ScreenPlay/profile.h" #include diff --git a/ScreenPlay/src/projectsettingslistitem.h b/ScreenPlay/inc/public/ScreenPlay/projectsettingslistitem.h similarity index 100% rename from ScreenPlay/src/projectsettingslistitem.h rename to ScreenPlay/inc/public/ScreenPlay/projectsettingslistitem.h diff --git a/ScreenPlay/src/projectsettingslistmodel.h b/ScreenPlay/inc/public/ScreenPlay/projectsettingslistmodel.h similarity index 99% rename from ScreenPlay/src/projectsettingslistmodel.h rename to ScreenPlay/inc/public/ScreenPlay/projectsettingslistmodel.h index e3ecec41..37ec1876 100644 --- a/ScreenPlay/src/projectsettingslistmodel.h +++ b/ScreenPlay/inc/public/ScreenPlay/projectsettingslistmodel.h @@ -43,7 +43,7 @@ #include #include -#include "util.h" +#include "ScreenPlay/util.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/screenplaymanager.h b/ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h similarity index 100% rename from ScreenPlay/src/screenplaymanager.h rename to ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h diff --git a/ScreenPlay/src/screenplaywallpaper.h b/ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h similarity index 97% rename from ScreenPlay/src/screenplaywallpaper.h rename to ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h index b8f65109..16a91f02 100644 --- a/ScreenPlay/src/screenplaywallpaper.h +++ b/ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h @@ -41,11 +41,11 @@ #include -#include "globalvariables.h" -#include "projectsettingslistmodel.h" -#include "sdkconnection.h" -#include "settings.h" -#include "util.h" +#include "ScreenPlay/globalvariables.h" +#include "ScreenPlay/projectsettingslistmodel.h" +#include "ScreenPlay/sdkconnection.h" +#include "ScreenPlay/settings.h" +#include "ScreenPlay/util.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/screenplaywidget.h b/ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h similarity index 97% rename from ScreenPlay/src/screenplaywidget.h rename to ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h index b657273c..fe68488c 100644 --- a/ScreenPlay/src/screenplaywidget.h +++ b/ScreenPlay/inc/public/ScreenPlay/screenplaywidget.h @@ -43,9 +43,9 @@ #include #include "ScreenPlayUtil/util.h" -#include "globalvariables.h" -#include "projectsettingslistmodel.h" -#include "sdkconnection.h" +#include "ScreenPlay/globalvariables.h" +#include "ScreenPlay/projectsettingslistmodel.h" +#include "ScreenPlay/sdkconnection.h" #include #include diff --git a/ScreenPlay/src/sdkconnection.h b/ScreenPlay/inc/public/ScreenPlay/sdkconnection.h similarity index 98% rename from ScreenPlay/src/sdkconnection.h rename to ScreenPlay/inc/public/ScreenPlay/sdkconnection.h index bb576423..ff4957fa 100644 --- a/ScreenPlay/src/sdkconnection.h +++ b/ScreenPlay/inc/public/ScreenPlay/sdkconnection.h @@ -47,8 +47,8 @@ #include #include "ScreenPlayUtil/util.h" -#include "globalvariables.h" -#include "util.h" +#include "ScreenPlay/globalvariables.h" +#include "ScreenPlay/util.h" #include diff --git a/ScreenPlay/src/settings.h b/ScreenPlay/inc/public/ScreenPlay/settings.h similarity index 99% rename from ScreenPlay/src/settings.h rename to ScreenPlay/inc/public/ScreenPlay/settings.h index 00a43fa3..bc88e1fe 100644 --- a/ScreenPlay/src/settings.h +++ b/ScreenPlay/inc/public/ScreenPlay/settings.h @@ -61,8 +61,8 @@ #include #include -#include "globalvariables.h" -#include "util.h" +#include "ScreenPlay/globalvariables.h" +#include "ScreenPlay/util.h" #include #include diff --git a/ScreenPlay/src/util.h b/ScreenPlay/inc/public/ScreenPlay/util.h similarity index 99% rename from ScreenPlay/src/util.h rename to ScreenPlay/inc/public/ScreenPlay/util.h index 1d552a55..5225c323 100644 --- a/ScreenPlay/src/util.h +++ b/ScreenPlay/inc/public/ScreenPlay/util.h @@ -54,7 +54,7 @@ #include #include "ScreenPlayUtil/util.h" -#include "globalvariables.h" +#include "ScreenPlay/globalvariables.h" #include #include diff --git a/ScreenPlay/src/wizards.h b/ScreenPlay/inc/public/ScreenPlay/wizards.h similarity index 97% rename from ScreenPlay/src/wizards.h rename to ScreenPlay/inc/public/ScreenPlay/wizards.h index 7df6382e..c10c18a8 100644 --- a/ScreenPlay/src/wizards.h +++ b/ScreenPlay/inc/public/ScreenPlay/wizards.h @@ -54,9 +54,9 @@ #include #include -#include "createimportvideo.h" -#include "globalvariables.h" -#include "util.h" +#include "ScreenPlay/createimportvideo.h" +#include "ScreenPlay/globalvariables.h" +#include "ScreenPlay/util.h" #include #include diff --git a/ScreenPlay/main.cpp b/ScreenPlay/main.cpp index c8631f6e..446dec22 100644 --- a/ScreenPlay/main.cpp +++ b/ScreenPlay/main.cpp @@ -32,7 +32,7 @@ ** ****************************************************************************/ -#include "app.h" +#include "ScreenPlay/app.h" #include #include #include diff --git a/ScreenPlay/app.cpp b/ScreenPlay/src/app.cpp similarity index 99% rename from ScreenPlay/app.cpp rename to ScreenPlay/src/app.cpp index a2290fd7..2f5c3a62 100644 --- a/ScreenPlay/app.cpp +++ b/ScreenPlay/src/app.cpp @@ -1,4 +1,4 @@ -#include "app.h" +#include "ScreenPlay/app.h" #include "steam/steam_qt_enums_generated.h" #include diff --git a/ScreenPlay/src/create.cpp b/ScreenPlay/src/create.cpp index ad1819ff..d48cef02 100644 --- a/ScreenPlay/src/create.cpp +++ b/ScreenPlay/src/create.cpp @@ -1,4 +1,4 @@ -#include "create.h" +#include "ScreenPlay/create.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/createimportvideo.cpp b/ScreenPlay/src/createimportvideo.cpp index 5eacd89c..8c7cf020 100644 --- a/ScreenPlay/src/createimportvideo.cpp +++ b/ScreenPlay/src/createimportvideo.cpp @@ -1,4 +1,4 @@ -#include "createimportvideo.h" +#include "ScreenPlay/createimportvideo.h" #include "ScreenPlayUtil/util.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/globalvariables.cpp b/ScreenPlay/src/globalvariables.cpp index b60d85de..46dcb41a 100644 --- a/ScreenPlay/src/globalvariables.cpp +++ b/ScreenPlay/src/globalvariables.cpp @@ -1,4 +1,4 @@ -#include "globalvariables.h" +#include "ScreenPlay/globalvariables.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/installedlistfilter.cpp b/ScreenPlay/src/installedlistfilter.cpp index 2bed6621..98f13d36 100644 --- a/ScreenPlay/src/installedlistfilter.cpp +++ b/ScreenPlay/src/installedlistfilter.cpp @@ -1,4 +1,4 @@ -#include "installedlistfilter.h" +#include "ScreenPlay/installedlistfilter.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/installedlistmodel.cpp b/ScreenPlay/src/installedlistmodel.cpp index 65ad38af..b34ca3cd 100644 --- a/ScreenPlay/src/installedlistmodel.cpp +++ b/ScreenPlay/src/installedlistmodel.cpp @@ -1,4 +1,4 @@ -#include "installedlistmodel.h" +#include "ScreenPlay/installedlistmodel.h" #include namespace ScreenPlay { diff --git a/ScreenPlay/src/monitorlistmodel.cpp b/ScreenPlay/src/monitorlistmodel.cpp index b2c0cdd6..198d0d64 100644 --- a/ScreenPlay/src/monitorlistmodel.cpp +++ b/ScreenPlay/src/monitorlistmodel.cpp @@ -1,4 +1,4 @@ -#include "monitorlistmodel.h" +#include "ScreenPlay/monitorlistmodel.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/profilelistmodel.cpp b/ScreenPlay/src/profilelistmodel.cpp index 2d8b8590..d994daa0 100644 --- a/ScreenPlay/src/profilelistmodel.cpp +++ b/ScreenPlay/src/profilelistmodel.cpp @@ -1,4 +1,4 @@ -#include "profilelistmodel.h" +#include "ScreenPlay/profilelistmodel.h" #include #include diff --git a/ScreenPlay/src/projectsettingslistmodel.cpp b/ScreenPlay/src/projectsettingslistmodel.cpp index 79875898..60cb5775 100644 --- a/ScreenPlay/src/projectsettingslistmodel.cpp +++ b/ScreenPlay/src/projectsettingslistmodel.cpp @@ -1,4 +1,4 @@ -#include "projectsettingslistmodel.h" +#include "ScreenPlay/projectsettingslistmodel.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/screenplaymanager.cpp b/ScreenPlay/src/screenplaymanager.cpp index 6f06bade..ec722011 100644 --- a/ScreenPlay/src/screenplaymanager.cpp +++ b/ScreenPlay/src/screenplaymanager.cpp @@ -1,4 +1,4 @@ -#include "screenplaymanager.h" +#include "ScreenPlay/screenplaymanager.h" #include namespace ScreenPlay { diff --git a/ScreenPlay/src/screenplaywallpaper.cpp b/ScreenPlay/src/screenplaywallpaper.cpp index 9ba0dbd7..fa4879a5 100644 --- a/ScreenPlay/src/screenplaywallpaper.cpp +++ b/ScreenPlay/src/screenplaywallpaper.cpp @@ -1,4 +1,4 @@ -#include "screenplaywallpaper.h" +#include "ScreenPlay/screenplaywallpaper.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/screenplaywidget.cpp b/ScreenPlay/src/screenplaywidget.cpp index dee57ac5..1b471ae5 100644 --- a/ScreenPlay/src/screenplaywidget.cpp +++ b/ScreenPlay/src/screenplaywidget.cpp @@ -1,4 +1,4 @@ -#include "screenplaywidget.h" +#include "ScreenPlay/screenplaywidget.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/sdkconnection.cpp b/ScreenPlay/src/sdkconnection.cpp index c60bd62a..54169364 100644 --- a/ScreenPlay/src/sdkconnection.cpp +++ b/ScreenPlay/src/sdkconnection.cpp @@ -1,4 +1,4 @@ -#include "sdkconnection.h" +#include "ScreenPlay/sdkconnection.h" namespace ScreenPlay { diff --git a/ScreenPlay/src/settings.cpp b/ScreenPlay/src/settings.cpp index 4fb47565..21867f50 100644 --- a/ScreenPlay/src/settings.cpp +++ b/ScreenPlay/src/settings.cpp @@ -1,4 +1,4 @@ -#include "settings.h" +#include "ScreenPlay/settings.h" #include "ScreenPlayUtil/util.h" #include diff --git a/ScreenPlay/src/util.cpp b/ScreenPlay/src/util.cpp index 0e7a57d5..71007f21 100644 --- a/ScreenPlay/src/util.cpp +++ b/ScreenPlay/src/util.cpp @@ -1,4 +1,4 @@ -#include "util.h" +#include "ScreenPlay/util.h" #include diff --git a/ScreenPlay/src/wizards.cpp b/ScreenPlay/src/wizards.cpp index 45f84df0..e8ba6717 100644 --- a/ScreenPlay/src/wizards.cpp +++ b/ScreenPlay/src/wizards.cpp @@ -1,4 +1,4 @@ -#include "wizards.h" +#include "ScreenPlay/wizards.h" #include "ScreenPlayUtil/util.h" diff --git a/ScreenPlay/tests/tst_main.cpp b/ScreenPlay/tests/tst_main.cpp index f03db4d3..fe38f746 100644 --- a/ScreenPlay/tests/tst_main.cpp +++ b/ScreenPlay/tests/tst_main.cpp @@ -32,8 +32,8 @@ ** ****************************************************************************/ -#include "app.h" -#include "create.h" +#include "ScreenPlay/app.h" +#include "ScreenPlay/create.h" #include #include #include @@ -45,6 +45,7 @@ Q_IMPORT_QML_PLUGIN(ScreenPlayQmlPlugin) Q_IMPORT_QML_PLUGIN(ScreenPlayUtilPlugin) +Q_IMPORT_QML_PLUGIN(ScreenPlayWorkshopPlugin) class ScreenPlayTest : public QObject { Q_OBJECT @@ -52,8 +53,7 @@ class ScreenPlayTest : public QObject { private slots: void initTestCase() { - Q_INIT_RESOURCE(ScreenPlayQML); - Q_INIT_RESOURCE(ScreenPlayAssets); + Q_INIT_RESOURCE(Resources); app.init(); m_window = qobject_cast(app.mainWindowEngine()->rootObjects().first()); diff --git a/ScreenPlayShader/CMakeLists.txt b/ScreenPlayShader/CMakeLists.txt index 5c624bd8..df4e50ac 100644 --- a/ScreenPlayShader/CMakeLists.txt +++ b/ScreenPlayShader/CMakeLists.txt @@ -23,20 +23,18 @@ set(SHADER shaders/lightning.frag shaders/wobble.frag shaders/water.frag - shaders/water.vert -) + shaders/water.vert) set(RESOURCES assets/mask_01.png assets/Shadertoy_Bayer.png assets/Shadertoy_Gray_Noise_Medium.png assets/Shadertoy_Lichen.jpg - assets/test_image_andras-vas-Bd7gNnWJBkU-unsplash.jpg -) + assets/test_image_andras-vas-Bd7gNnWJBkU-unsplash.jpg) qt_add_library(${PROJECT_NAME} STATIC) target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Quick) -target_include_directories(${PROJECT_NAME} PUBLIC src/ ) +target_include_directories(${PROJECT_NAME} PUBLIC src/) qt_add_qml_module( ${PROJECT_NAME} @@ -67,6 +65,6 @@ qt6_add_shaders( if(${SCREENPLAY_TESTS}) qt_add_executable(tst_ScreenPlayShader src/TestMain.cpp) - target_link_libraries(tst_ScreenPlayShader PRIVATE Qt::Quick ${PROJECT_NAME}plugin ) + target_link_libraries(tst_ScreenPlayShader PRIVATE Qt::Quick ${PROJECT_NAME}plugin) target_compile_definitions(tst_ScreenPlayShader PRIVATE $<$,$>:QT_QML_DEBUG>) endif() diff --git a/ScreenPlayUtil/qml/Dialogs/CriticalError.qml b/ScreenPlayUtil/qml/Dialogs/CriticalError.qml index e4222a41..22fa2532 100644 --- a/ScreenPlayUtil/qml/Dialogs/CriticalError.qml +++ b/ScreenPlayUtil/qml/Dialogs/CriticalError.qml @@ -41,7 +41,7 @@ Common.Dialog { Layout.alignment: Qt.AlignHCenter Layout.preferredWidth: 150 Layout.preferredHeight: 150 - source: "qrc:/ScreenPlayWorkshop/assets/icons/exclamation-triangle-solid.svg" + source: "qrc:/assets/icons/exclamation-triangle-solid.svg" fillMode: Image.PreserveAspectFit layer { diff --git a/ScreenPlayWorkshop/CMakeLists.txt b/ScreenPlayWorkshop/CMakeLists.txt index 59677c9c..4358d830 100644 --- a/ScreenPlayWorkshop/CMakeLists.txt +++ b/ScreenPlayWorkshop/CMakeLists.txt @@ -86,7 +86,6 @@ elseif(UNIX) set(STEAM_BIN ${STEAM_LIB}) endif() - qt_add_library(${PROJECT_NAME} STATIC ${RESOURCES}) # Needed by the automatic generated target missing includes # https://github.com/qt/qtdeclarative/blob/7a7064e14f094e843e1ee832cc927e86f887621a/src/qml/Qt6QmlMacros.cmake#L2042 @@ -133,13 +132,13 @@ if(${SCREENPLAY_STEAM}) if(${SCREENPLAY_TESTS}) qt_add_executable(tst_ScreenPlayWorkshop src/TestMain.cpp) - target_link_libraries(tst_ScreenPlayWorkshop PRIVATE - Qt6::Quick - ${PROJECT_NAME}plugin - ScreenPlayUtilplugin - SteamSDK - SteamSDKQtEnums) + target_link_libraries( + tst_ScreenPlayWorkshop + PRIVATE Qt6::Quick + ${PROJECT_NAME}plugin + ScreenPlayUtilplugin + SteamSDK + SteamSDKQtEnums) target_compile_definitions(tst_ScreenPlayWorkshop PRIVATE $<$,$>:QT_QML_DEBUG>) endif() endif() -