oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: reference windeployqt directly

Browse Source
This commit is contained in:
itsmattkc
2021-03-23 23:44:01 +11:00
parent 78b1407387
commit 9e4d42da26
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+2 -2
View File
@@ -198,8 +198,8 @@ jobs:
cp app/olive-editor.exe olive-editor
cp app/olive-crashhandler.exe olive-editor
cp app/olive-editor.pdb olive-editor
windeployqt olive-editor/olive-crashhandler.exe
windeployqt olive-editor/olive-editor.exe
$DEP_LOCATION/bin/windeployqt olive-editor/olive-crashhandler.exe
$DEP_LOCATION/bin/windeployqt olive-editor/olive-editor.exe
cp $(cygpath $DEP_LOCATION)/bin/*.dll olive-editor
cp $(cygpath $DEP_LOCATION)/crashpad/out/Default/crashpad_handler.exe olive-editor
cp $(cygpath $DEP_LOCATION)/bin/minidump_stackwalk.exe olive-editor
app/packaging/windows/nsis/olive.nsi
+1 -1
View File
@@ -81,5 +81,5 @@ Section "uninstall"
SectionEnd
Function LaunchOlive
ExecShell "" "$INSTDIR\${APP_TARGET}.exe"
ShellExecAsUser::ShellExecAsUser "" "$INSTDIR\${APP_TARGET}.exe"
FunctionEnd
app/widget/timelinewidget/view/timelineview.cpp
+1 -1
View File
@@ -401,7 +401,7 @@ void TimelineView::DrawBlocks(QPainter *painter, bool foreground)
Block* block = track->NearestBlockBeforeOrAt(start_time);
while (block) {
if (block->type() == Block::kClip) {
if (block->type() == Block::kClip || block->type() == Block::kTransition) {
qreal block_left = qMax(left_bound, TimeToScene(block->in()));
qreal block_right = qMin(right_bound, TimeToScene(block->out())) - 1;