mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-09-18 16:32:33 +02:00
Fix ci
Fix exe icon Fix Qt version to 5.13
This commit is contained in:
parent
6c5a8f9049
commit
6299e1e7dd
@ -31,6 +31,7 @@ SOURCES += main.cpp \
|
|||||||
src/create.cpp
|
src/create.cpp
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
TRANSLATIONS = translations/ScreenPlay_en.ts \
|
TRANSLATIONS = translations/ScreenPlay_en.ts \
|
||||||
translations/ScreenPlay_de.ts
|
translations/ScreenPlay_de.ts
|
||||||
|
|
||||||
@ -69,6 +70,9 @@ INCLUDEPATH += $$PWD/../Common/vcpkg/installed/x64-windows/include
|
|||||||
DEPENDPATH += $$PWD/../Common/vcpkg/installed/x64-windows/include
|
DEPENDPATH += $$PWD/../Common/vcpkg/installed/x64-windows/include
|
||||||
|
|
||||||
win32 {
|
win32 {
|
||||||
|
RC_ICONS += favicon.ico
|
||||||
|
|
||||||
|
|
||||||
LIBS += -L$$PWD/../Common/vcpkg/installed/x64-windows/lib/ -llibzippp
|
LIBS += -L$$PWD/../Common/vcpkg/installed/x64-windows/lib/ -llibzippp
|
||||||
CONFIG(debug, debug|release) {
|
CONFIG(debug, debug|release) {
|
||||||
install_it.files += $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/zip.dll \
|
install_it.files += $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/zip.dll \
|
||||||
|
@ -24,7 +24,6 @@ int main(int argc, char* argv[])
|
|||||||
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||||
|
|
||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
|
|
||||||
// This gives us nice clickable output in QtCreator
|
// This gives us nice clickable output in QtCreator
|
||||||
qSetMessagePattern("%{if-category}%{category}: %{endif}%{message}\n Loc: [%{file}:%{line}]");
|
qSetMessagePattern("%{if-category}%{category}: %{endif}%{message}\n Loc: [%{file}:%{line}]");
|
||||||
|
|
||||||
@ -37,9 +36,10 @@ int main(int argc, char* argv[])
|
|||||||
if (argumentList.length() == 1) {
|
if (argumentList.length() == 1) {
|
||||||
QVector<int> list;
|
QVector<int> list;
|
||||||
list.append(0);
|
list.append(0);
|
||||||
|
|
||||||
#if defined(Q_OS_WIN)
|
#if defined(Q_OS_WIN)
|
||||||
//WinWindow window(list, "test", "appid", "1");
|
WinWindow window(list, "test", "appid", "1");
|
||||||
WinWindow window(list, "D:/672870/827874818", "appid", "1");
|
//WinWindow window(list, "D:/672870/827874818", "appid", "1");
|
||||||
#endif
|
#endif
|
||||||
#if defined(Q_OS_LINUX)
|
#if defined(Q_OS_LINUX)
|
||||||
LinuxWindow window(list, "test", "appid", "1");
|
LinuxWindow window(list, "test", "appid", "1");
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
setlocal EnableExtensions
|
setlocal EnableExtensions
|
||||||
|
|
||||||
set PATH=%PATH%;C:\Qt\Tools\QtCreator\bin
|
set PATH=%PATH%;C:\Qt\Tools\QtCreator\bin
|
||||||
set PATH=%PATH%;C:\Qt\5.12.0\msvc2017_64\bin
|
set PATH=%PATH%;C:\Qt\5.13.0\msvc2017_64\bin
|
||||||
set root=%cd%
|
set root=%cd%
|
||||||
|
|
||||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat"
|
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
setlocal EnableExtensions
|
setlocal EnableExtensions
|
||||||
|
|
||||||
set PATH=%PATH%;C:\Qt\Tools\QtCreator\bin
|
set PATH=%PATH%;C:\Qt\Tools\QtCreator\bin
|
||||||
set PATH=%PATH%;C:\Qt\5.12.0\msvc2017_64\bin
|
set PATH=%PATH%;C:\Qt\5.13.0\msvc2017_64\bin
|
||||||
set root=%cd%
|
set root=%cd%
|
||||||
|
|
||||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat"
|
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsx86_amd64.bat"
|
||||||
@ -17,13 +17,13 @@ echo "Copy ScreenPlaySDK"
|
|||||||
xcopy /s /y ScreenPlaySDK\release ..\PACKAGE
|
xcopy /s /y ScreenPlaySDK\release ..\PACKAGE
|
||||||
echo "Copy ScreenPlayWidget"
|
echo "Copy ScreenPlayWidget"
|
||||||
xcopy /s /y ScreenPlayWidget\release ..\PACKAGE
|
xcopy /s /y ScreenPlayWidget\release ..\PACKAGE
|
||||||
echo "Copy ScreenPlayWindow"
|
echo "Copy ScreenPlayWallpaper"
|
||||||
xcopy /s /y ScreenPlayWindow\release ..\PACKAGE
|
xcopy /s /y ScreenPlayWallpaper\release ..\PACKAGE
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
windeployqt.exe --release --qmldir ScreenPlay/qml PACKAGE/ScreenPlay.exe
|
windeployqt.exe --release --qmldir ScreenPlay/qml PACKAGE/ScreenPlay.exe
|
||||||
windeployqt.exe --release --qmldir ScreenPlayWindow/qml PACKAGE/ScreenPlayWindow.exe
|
windeployqt.exe --release --qmldir ScreenPlayWallpaper/qml PACKAGE/ScreenPlayWallpaper.exe
|
||||||
|
|
||||||
cd PACKAGE
|
cd PACKAGE
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user