Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Code Issues Projects Releases Activity

Remove util member

Browse Source 
Fix install_dependencies_windows
This commit is contained in:
Elias Steurer 2020-09-18 16:34:14 +02:00
parent c6ac701875
commit f2d791fc6f
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ScreenPlay/CMakeLists.txt
View File

@ -87,12 +87,13 @@ add_executable(${PROJECT_NAME} ${src} ${headers} ${resources} ${qml})
if(WIN32)
# Icon
target_sources(${PROJECT_NAME} PRIVATE ScreenPlay.rc)
# Disable console window on Windows
# https://stackoverflow.com/questions/8249028/how-do-i-keep-my-qt-c-program-from-opening-a-console-in-windows
set_property(TARGET ${PROJECT_NAME} PROPERTY WIN32_EXECUTABLE true)
endif()
# Disable console window on Windows
# https://stackoverflow.com/questions/8249028/how-do-i-keep-my-qt-c-program-from-opening-a-console-in-windows
set_property(TARGET ${PROJECT_NAME} PROPERTY WIN32_EXECUTABLE true)
target_compile_definitions(${PROJECT_NAME} PRIVATE "GIT_VERSION=${GIT_VERSION}")

1
ScreenPlay/src/util.cpp
View File

@ -19,7 +19,6 @@ Util::Util(QNetworkAccessManager* networkAccessManager, QObject* parent)
// Fix log access vilation on quit
QObject::connect(QGuiApplication::instance(), &QGuiApplication::aboutToQuit, this, []() { utilPointer = nullptr; });
qRegisterMetaType<Util::AquireFFMPEGStatus>();
qmlRegisterUncreatableType<Util>("ScreenPlay.QMLUtilities", 1, 0, "QMLUtilities", "Error only for enums");
// In release mode redirect messages to logging otherwhise we break the nice clickable output :(

3
ScreenPlay/src/util.h
View File

@ -85,7 +85,6 @@ class Util : public QObject {
public:
explicit Util(QNetworkAccessManager* networkAccessManager, QObject* parent = nullptr);
QString debugMessages() const
{
return m_debugMessages;
@ -135,8 +134,6 @@ public slots:
emit requestToggleWallpaperConfiguration();
}
void appendDebugMessages(QString debugMessages)
{
if (m_debugMessages.size() > 10000) {

13
install_dependencies_windows.bat
View File

@ -11,6 +11,9 @@ call bootstrap-vcpkg.bat
rem Install vcpkg dependencies
vcpkg.exe install openssl --triplet x64-windows --recurse
cd ..
cd ..
rem Donwload ffmpeg
curl.exe -L https://www.gyan.dev/ffmpeg/builds/packages/ffmpeg-4.3.1-full_build.zip --output ffmpeg.zip
@ -20,8 +23,12 @@ rem --strip-components 2 removes folder
tar -xvf ffmpeg.zip --strip-components 2 ffmpeg-4.3.1-full_build/bin
rem Remove not used ffplay
rm ffplay.exe
DEL ffplay.exe
rem Move ffmpeg into folder
mv ffmpeg.exe Common/ffmpeg
mv ffprobe.exe Common/ffmpeg
move /Y ffmpeg.exe Common/ffmpeg
move /Y ffprobe.exe Common/ffmpeg
DEL ffmpeg.zip
pause