1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-06 19:12:30 +01:00

Formatting

This commit is contained in:
Elias Steurer 2022-04-24 10:37:56 +02:00
parent 8cc5901725
commit 6a11bcd27e
6 changed files with 8 additions and 15 deletions

View File

@ -165,13 +165,10 @@ target_link_libraries(
if(${SCREENPLAY_STEAM})
target_compile_definitions(ScreenPlayLib PRIVATE SCREENPLAY_STEAM=1)
target_link_libraries(
ScreenPlayLib
PUBLIC ScreenPlayWorkshopplugin
ScreenPlayWorkshop)
target_link_libraries(ScreenPlayLib PUBLIC ScreenPlayWorkshopplugin ScreenPlayWorkshop)
endif()
target_include_directories(ScreenPlayLib PUBLIC )
target_include_directories(ScreenPlayLib PUBLIC)
qt_add_executable(${PROJECT_NAME} main.cpp)
target_link_libraries(${PROJECT_NAME} PRIVATE ScreenPlayLib)
@ -181,14 +178,10 @@ if(${SCREENPLAY_TESTS})
target_link_libraries(tst_ScreenPlay PRIVATE ScreenPlayLib Qt6::Test)
if(${SCREENPLAY_STEAM})
target_compile_definitions(tst_ScreenPlay PRIVATE SCREENPLAY_STEAM=1)
target_link_libraries(
tst_ScreenPlay
PUBLIC ScreenPlayWorkshopplugin
ScreenPlayWorkshop)
target_link_libraries(tst_ScreenPlay PUBLIC ScreenPlayWorkshopplugin ScreenPlayWorkshop)
endif()
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:

View File

@ -56,10 +56,10 @@
#include <memory>
#include "ScreenPlayUtil/util.h"
#include "ScreenPlay/createimportvideo.h"
#include "ScreenPlay/globalvariables.h"
#include "ScreenPlay/util.h"
#include "ScreenPlayUtil/util.h"
namespace ScreenPlay {

View File

@ -54,10 +54,10 @@
#include <QVector>
#include <QtConcurrent/QtConcurrent>
#include "ScreenPlayUtil/projectfile.h"
#include "ScreenPlay/globalvariables.h"
#include "ScreenPlay/profilelistmodel.h"
#include "ScreenPlay/util.h"
#include "ScreenPlayUtil/projectfile.h"
#include <memory>

View File

@ -42,10 +42,10 @@
#include <QPoint>
#include <QProcess>
#include "ScreenPlayUtil/util.h"
#include "ScreenPlay/globalvariables.h"
#include "ScreenPlay/projectsettingslistmodel.h"
#include "ScreenPlay/sdkconnection.h"
#include "ScreenPlayUtil/util.h"
#include <memory>
#include <utility>

View File

@ -46,9 +46,9 @@
#include <QVector>
#include <QWebSocketServer>
#include "ScreenPlayUtil/util.h"
#include "ScreenPlay/globalvariables.h"
#include "ScreenPlay/util.h"
#include "ScreenPlayUtil/util.h"
#include <memory>

View File

@ -53,8 +53,8 @@
#include <QtConcurrent/QtConcurrent>
#include <qqml.h>
#include "ScreenPlayUtil/util.h"
#include "ScreenPlay/globalvariables.h"
#include "ScreenPlayUtil/util.h"
#include <fstream>
#include <iostream>