From 9abe36377dc2752f6d76ce9294d8177a2fbc4b43 Mon Sep 17 00:00:00 2001 From: rankun Date: Wed, 26 Feb 2020 12:51:02 +0800 Subject: [PATCH 01/10] feat: change selection-background-color --- QtScrcpy/res/qss/psblack.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QtScrcpy/res/qss/psblack.css b/QtScrcpy/res/qss/psblack.css index beefb89..30b1910 100644 --- a/QtScrcpy/res/qss/psblack.css +++ b/QtScrcpy/res/qss/psblack.css @@ -73,7 +73,7 @@ border:1px solid #242424; border-radius:3px; padding:2px; background:none; -selection-background-color:#484848; +selection-background-color:#264F78; selection-color:#DCDCDC; } From e975e223259b0034f21553ff815a92993bccef68 Mon Sep 17 00:00:00 2001 From: rankun Date: Wed, 26 Feb 2020 15:43:15 +0800 Subject: [PATCH 02/10] feat: mac need more width --- QtScrcpy/dialog.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp index a84f32f..f21cd5d 100644 --- a/QtScrcpy/dialog.cpp +++ b/QtScrcpy/dialog.cpp @@ -98,6 +98,11 @@ void Dialog::initUI() ui->formatBox->setCurrentIndex(Config::getInstance().getRecordFormatIndex()); ui->recordPathEdt->setText(Config::getInstance().getRecordPath()); + +#ifdef Q_OS_OSX + // mac need more width + setFixedWidth(520); +#endif } void Dialog::execAdbCmd() From 44e97e559115a073b76d248ffd4d08cb1281aa8e Mon Sep 17 00:00:00 2001 From: rankun Date: Wed, 26 Feb 2020 16:33:43 +0800 Subject: [PATCH 03/10] feat: mac enable keymap --- QtScrcpy/main.cpp | 4 ++++ QtScrcpy/res/Info_mac.plist | 2 ++ QtScrcpy/util/mousetap/cocoamousetap.mm | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp index 405d632..91c5d10 100644 --- a/QtScrcpy/main.cpp +++ b/QtScrcpy/main.cpp @@ -48,6 +48,10 @@ int main(int argc, char *argv[]) qputenv("QTSCRCPY_CONFIG_PATH", "../../../../config"); #endif +#ifdef Q_OS_OSX + qputenv("QTSCRCPY_KEYMAP_PATH", "../../../../../../keymap"); +#endif + #ifdef Q_OS_LINUX qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/linux/adb"); qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server"); diff --git a/QtScrcpy/res/Info_mac.plist b/QtScrcpy/res/Info_mac.plist index c32ac18..f60e1f0 100644 --- a/QtScrcpy/res/Info_mac.plist +++ b/QtScrcpy/res/Info_mac.plist @@ -28,6 +28,8 @@ 1.2.0 LSMinimumSystemVersion 10.10 + NSAppleEventsUsageDescription + play game need this NSHumanReadableCopyright Copyright © 2018-2038 rankun. All rights reserved. NSMainStoryboardFile diff --git a/QtScrcpy/util/mousetap/cocoamousetap.mm b/QtScrcpy/util/mousetap/cocoamousetap.mm index fdcd129..c03827c 100644 --- a/QtScrcpy/util/mousetap/cocoamousetap.mm +++ b/QtScrcpy/util/mousetap/cocoamousetap.mm @@ -62,10 +62,14 @@ static CGEventRef Cocoa_MouseTapCallback(CGEventTapProxy proxy, CGEventType type eventLocation = CGEventGetUnflippedLocation(event); windowRect = [nswindow contentRectForFrameRect:[nswindow frame]]; + windowRect.origin.x += 100; + windowRect.origin.y += 30; + windowRect.size.width -= 180; + windowRect.size.height -= 60; + newWindowRect = NSMakeRect(windowRect.origin.x, windowRect.origin.y, windowRect.size.width - 10, windowRect.size.height - 10); - qDebug() << newWindowRect.origin.x << newWindowRect.origin.y - << newWindowRect.size.width << newWindowRect.size.height; + //qDebug() << newWindowRect.origin.x << newWindowRect.origin.y << newWindowRect.size.width << newWindowRect.size.height; if (!NSMouseInRect(NSPointFromCGPoint(eventLocation), newWindowRect, NO)) { From 277a7006f60c9ca4315dac7452e3826f3793d1f6 Mon Sep 17 00:00:00 2001 From: rankun Date: Wed, 26 Feb 2020 16:52:28 +0800 Subject: [PATCH 04/10] fix: mac full screen --- QtScrcpy/device/ui/videoform.cpp | 4 ---- QtScrcpy/res/Info_mac.plist | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp index 76ac4a5..143da70 100644 --- a/QtScrcpy/device/ui/videoform.cpp +++ b/QtScrcpy/device/ui/videoform.cpp @@ -172,11 +172,7 @@ void VideoForm::updateShowSize(const QSize &newSize) } if (showSize != size()) { -#ifdef Q_OS_OSX - setFixedSize(showSize); -#else resize(showSize); -#endif if (m_skin) { updateStyleSheet(vertical); } diff --git a/QtScrcpy/res/Info_mac.plist b/QtScrcpy/res/Info_mac.plist index f60e1f0..6a10390 100644 --- a/QtScrcpy/res/Info_mac.plist +++ b/QtScrcpy/res/Info_mac.plist @@ -29,7 +29,7 @@ LSMinimumSystemVersion 10.10 NSAppleEventsUsageDescription - play game need this + NSHumanReadableCopyright Copyright © 2018-2038 rankun. All rights reserved. NSMainStoryboardFile From ad5349c49dfa5a578f3aea0f73c591e086b6d67c Mon Sep 17 00:00:00 2001 From: rankun Date: Thu, 27 Feb 2020 10:11:15 +0800 Subject: [PATCH 05/10] fix: tool from move bug Close #78 --- QtScrcpy/device/ui/videoform.cpp | 2 +- QtScrcpy/uibase/magneticwidget.cpp | 23 ++++++----------------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp index 143da70..f4996ea 100644 --- a/QtScrcpy/device/ui/videoform.cpp +++ b/QtScrcpy/device/ui/videoform.cpp @@ -166,7 +166,7 @@ void VideoForm::updateShowSize(const QSize &newSize) } if (!m_skin) { - // 减去标题栏高度 (mark:已经没有标题栏了) + // 减去标题栏高度 int titleBarHeight = style()->pixelMetric(QStyle::PM_TitleBarHeight); showSize.setHeight(showSize.height() - titleBarHeight); } diff --git a/QtScrcpy/uibase/magneticwidget.cpp b/QtScrcpy/uibase/magneticwidget.cpp index 7fad87c..7a61b81 100644 --- a/QtScrcpy/uibase/magneticwidget.cpp +++ b/QtScrcpy/uibase/magneticwidget.cpp @@ -184,23 +184,12 @@ void MagneticWidget::moveEvent(QMoveEvent *event) void MagneticWidget::getGeometry(QRect &relativeWidgetRect, QRect &targetWidgetRect) { - QRect parentRect = m_adsorbWidget->geometry(); - QRect targetRect = geometry(); + relativeWidgetRect.setTopLeft(m_adsorbWidget->pos()); + relativeWidgetRect.setWidth(m_adsorbWidget->width()); + relativeWidgetRect.setHeight(m_adsorbWidget->height()); - if (!m_adsorbWidget->windowFlags().testFlag(Qt::FramelessWindowHint)) { - // title bar height - int titleBarHeight = m_adsorbWidget->style()->pixelMetric(QStyle::PM_TitleBarHeight); - parentRect.translate(0, -titleBarHeight); - parentRect.setHeight(parentRect.height() + titleBarHeight); - } - - if (!windowFlags().testFlag(Qt::FramelessWindowHint)) { - // title bar height - int titleBarHeight = style()->pixelMetric(QStyle::PM_TitleBarHeight); - targetRect.translate(0, -titleBarHeight); - targetRect.setHeight(targetRect.height() + titleBarHeight); - } - relativeWidgetRect = parentRect; - targetWidgetRect = targetRect; + targetWidgetRect.setTopLeft(pos()); + targetWidgetRect.setWidth(width()); + targetWidgetRect.setHeight(height()); } From 6acef9430e478dbd7eae9cde46451012ee485687 Mon Sep 17 00:00:00 2001 From: Unknown <870709864@qq.com> Date: Thu, 27 Feb 2020 21:22:17 +0800 Subject: [PATCH 06/10] fix: fullscreen bug on ubuntu --- QtScrcpy/device/ui/videoform.cpp | 5 ++--- QtScrcpy/dialog.cpp | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/QtScrcpy/device/ui/videoform.cpp b/QtScrcpy/device/ui/videoform.cpp index f4996ea..834703d 100644 --- a/QtScrcpy/device/ui/videoform.cpp +++ b/QtScrcpy/device/ui/videoform.cpp @@ -92,10 +92,9 @@ void VideoForm::showToolForm(bool show) { if (!m_toolForm) { m_toolForm = new ToolForm(this, ToolForm::AP_OUTSIDE_RIGHT); - m_toolForm->move(pos().x() + geometry().width(), pos().y() + 30); - connect(m_toolForm, &ToolForm::screenshot, this, &VideoForm::screenshot); } + m_toolForm->move(pos().x() + geometry().width(), pos().y() + 30); m_toolForm->setVisible(show); } @@ -190,7 +189,7 @@ void VideoForm::switchFullScreen() //show(); #endif if (m_skin) { - updateStyleSheet(height() > width()); + updateStyleSheet(m_frameSize.height() > m_frameSize.width()); } showToolForm(true); #ifdef Q_OS_WIN32 diff --git a/QtScrcpy/dialog.cpp b/QtScrcpy/dialog.cpp index f21cd5d..938b6d5 100644 --- a/QtScrcpy/dialog.cpp +++ b/QtScrcpy/dialog.cpp @@ -103,6 +103,11 @@ void Dialog::initUI() // mac need more width setFixedWidth(520); #endif + +#ifdef Q_OS_LINUX + // linux need more width + setFixedWidth(480); +#endif } void Dialog::execAdbCmd() From 18ca34b600b50d2ebe8b40161e46566cf67bd11b Mon Sep 17 00:00:00 2001 From: Unknown <870709864@qq.com> Date: Thu, 27 Feb 2020 21:30:29 +0800 Subject: [PATCH 07/10] feat: load keymap on ubuntu --- QtScrcpy/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/QtScrcpy/main.cpp b/QtScrcpy/main.cpp index 91c5d10..b80156b 100644 --- a/QtScrcpy/main.cpp +++ b/QtScrcpy/main.cpp @@ -56,6 +56,7 @@ int main(int argc, char *argv[]) qputenv("QTSCRCPY_ADB_PATH", "../../../third_party/adb/linux/adb"); qputenv("QTSCRCPY_SERVER_PATH", "../../../third_party/scrcpy-server"); qputenv("QTSCRCPY_CONFIG_PATH", "../../../config"); + qputenv("QTSCRCPY_KEYMAP_PATH", "../../../keymap"); #endif //加载样式表 From 31a7d23dce5e5f87501d2205f36d09f230f53aca Mon Sep 17 00:00:00 2001 From: Unknown <870709864@qq.com> Date: Thu, 27 Feb 2020 22:39:47 +0800 Subject: [PATCH 08/10] chore: add linux build script --- ci/linux/build_for_linux.sh | 91 +++++++++++++++++++++++++++++++++++ ci/linux/publish_for_linux.sh | 85 ++++++++++++++++++++++++++++++++ ci/mac/build_for_mac.sh | 6 +-- ci/mac/publish_for_mac.sh | 4 +- 4 files changed, 181 insertions(+), 5 deletions(-) create mode 100755 ci/linux/build_for_linux.sh create mode 100755 ci/linux/publish_for_linux.sh diff --git a/ci/linux/build_for_linux.sh b/ci/linux/build_for_linux.sh new file mode 100755 index 0000000..d30ac38 --- /dev/null +++ b/ci/linux/build_for_linux.sh @@ -0,0 +1,91 @@ + +echo +echo +echo --------------------------------------------------------------- +echo check ENV +echo --------------------------------------------------------------- + +# 从环境变量获取必要参数 +# 例如 /home/barry/Qt5.9.6/5.9.6/gcc_64 +echo ENV_QT_GCC $ENV_QT_GCC + +# 获取绝对路径，保证其他目录执行此脚本依然正确 +{ +cd $(dirname "$0") +script_path=$(pwd) +cd - +} &> /dev/null # disable output +# 设置当前目录，cd的目录影响接下来执行程序的工作目录 +old_cd=$(pwd) +cd $(dirname "$0") + +# 启动参数声明 +build_mode=debug + +echo +echo +echo --------------------------------------------------------------- +echo check build param[debug/release] +echo --------------------------------------------------------------- + +# 编译参数检查 +build_mode=$(echo $1 | tr '[:upper:]' '[:lower:]') +if [[ $build_mode != "release" && $build_mode != "debug" ]]; then + echo "error: unkonow build mode -- $1" + exit 1 +fi + +# 提示 +echo current build mode: $build_mode + +# 环境变量设置 +export PATH=$ENV_QT_GCC/bin:$PATH + +echo +echo +echo --------------------------------------------------------------- +echo begin qmake build +echo --------------------------------------------------------------- + +# 删除输出目录 +output_path=$script_path../../output/linux/$build_mode +if [ -d "$output_path" ]; then + rm -rf $output_path +fi +# 删除临时目录 +temp_path=$script_path/../temp +if [ -d "$temp_path" ]; then + rm -rf $temp_path +fi +mkdir $temp_path +cd $temp_path + +qmake_params="-spec linux-g++" +if [ $build_mode == "debug" ]; then + qmake_params="$qmake_params CONFIG+=debug CONFIG+=x86_64 CONFIG+=qml_debug" +else + qmake_params="$qmake_params CONFIG+=x86_64 CONFIG+=qtquickcompiler" +fi + +# qmake ../../all.pro -spec linux-g++ CONFIG+=debug CONFIG+=x86_64 CONFIG+=qml_debug +qmake ../../all.pro $qmake_params +if [ $? -ne 0 ] ;then + echo "qmake failed" + exit 1 +fi + +make -j8 +if [ $? -ne 0 ] ;then + echo "make failed" + exit 1 +fi + +echo +echo +echo --------------------------------------------------------------- +echo finish!!! +echo --------------------------------------------------------------- + +# 恢复当前目录 +cd $old_cd +exit 0 diff --git a/ci/linux/publish_for_linux.sh b/ci/linux/publish_for_linux.sh new file mode 100755 index 0000000..7ced137 --- /dev/null +++ b/ci/linux/publish_for_linux.sh @@ -0,0 +1,85 @@ +echo +echo +echo --------------------------------------------------------------- +echo check ENV +echo --------------------------------------------------------------- + +# 从环境变量获取必要参数 +# 例如 /home/barry/Qt5.9.6/5.9.6/gcc_64 +echo ENV_QT_GCC $ENV_QT_GCC + +# 获取绝对路径，保证其他目录执行此脚本依然正确 +{ +cd $(dirname "$0") +script_path=$(pwd) +cd - +} &> /dev/null # disable output +# 设置当前目录，cd的目录影响接下来执行程序的工作目录 +old_cd=$(pwd) +cd $(dirname "$0") + +# 启动参数声明 +publish_dir=$1 + +# 提示 +echo current publish dir: $publish_dir + +# 环境变量设置 +keymap_path=$script_path/../../keymap +# config_path=$script_path/../../config + +publish_path=$script_path/$publish_dir +release_path=$script_path/../../output/linux/release + +export PATH=$ENV_QT_GCC/bin:$PATH + +if [ -d "$publish_path" ]; then + rm -rf $publish_path +fi + +# 复制要发布的包 +cp -r $release_path $publish_path +cp -r $keymap_path $publish_path/QtScrcpy.app/Contents/MacOS +# cp -r $config_path $publish_path/QtScrcpy.app/Contents/MacOS + +# 添加qt依赖包 +macdeployqt $publish_path/QtScrcpy.app + +# 删除多余qt依赖包 + +# PlugIns +rm -rf $publish_path/QtScrcpy.app/Contents/PlugIns/iconengines +# 截图功能需要libqjpeg.dylib +rm -f $publish_path/QtScrcpy.app/Contents/PlugIns/imageformats/libqgif.dylib +rm -f $publish_path/QtScrcpy.app/Contents/PlugIns/imageformats/libqicns.dylib +rm -f $publish_path/QtScrcpy.app/Contents/PlugIns/imageformats/libqico.dylib +# rm -f $publish_path/QtScrcpy.app/Contents/PlugIns/imageformats/libqjpeg.dylib +rm -f $publish_path/QtScrcpy.app/Contents/PlugIns/imageformats/libqmacheif.dylib +rm -f $publish_path/QtScrcpy.app/Contents/PlugIns/imageformats/libqmacjp2.dylib +rm -f $publish_path/QtScrcpy.app/Contents/PlugIns/imageformats/libqtga.dylib +rm -f $publish_path/QtScrcpy.app/Contents/PlugIns/imageformats/libqtiff.dylib +rm -f $publish_path/QtScrcpy.app/Contents/PlugIns/imageformats/libqwbmp.dylib +rm -f $publish_path/QtScrcpy.app/Contents/PlugIns/imageformats/libqwebp.dylib +rm -rf $publish_path/QtScrcpy.app/Contents/PlugIns/virtualkeyboard +rm -rf $publish_path/QtScrcpy.app/Contents/PlugIns/printsupport +rm -rf $publish_path/QtScrcpy.app/Contents/PlugIns/platforminputcontexts +rm -rf $publish_path/QtScrcpy.app/Contents/PlugIns/iconengines +rm -rf $publish_path/QtScrcpy.app/Contents/PlugIns/bearer + +# Frameworks +rm -rf $publish_path/QtScrcpy.app/Contents/Frameworks/QtVirtualKeyboard.framework +rm -rf $publish_path/Contents/Frameworks/QtSvg.framework + +# qml +rm -rf $publish_path/QtScrcpy.app/Contents/Frameworks/QtQml.framework +rm -rf $publish_path/QtScrcpy.app/Contents/Frameworks/QtQuick.framework + +echo +echo +echo --------------------------------------------------------------- +echo finish!!! +echo --------------------------------------------------------------- + +# 恢复当前目录 +cd $old_cd +exit 0 diff --git a/ci/mac/build_for_mac.sh b/ci/mac/build_for_mac.sh index 41ab2f6..d71b28a 100755 --- a/ci/mac/build_for_mac.sh +++ b/ci/mac/build_for_mac.sh @@ -6,7 +6,7 @@ echo check ENV echo --------------------------------------------------------------- # 从环境变量获取必要参数 -# 例如 /Users/barry/Qt5.12.5/5.12.5 +# 例如 /Users/barry/Qt5.12.5/5.12.5/clang_64 echo ENV_QT_CLANG $ENV_QT_CLANG # 获取绝对路径，保证其他目录执行此脚本依然正确 @@ -39,7 +39,7 @@ fi echo current build mode: $build_mode # 环境变量设置 -export PATH=$PATH:$ENV_QT_CLANG/bin +export PATH=$ENV_QT_CLANG/bin:$PATH echo echo @@ -88,4 +88,4 @@ echo --------------------------------------------------------------- # 恢复当前目录 cd $old_cd -exit 0 \ No newline at end of file +exit 0 diff --git a/ci/mac/publish_for_mac.sh b/ci/mac/publish_for_mac.sh index 1d76173..e3d679d 100755 --- a/ci/mac/publish_for_mac.sh +++ b/ci/mac/publish_for_mac.sh @@ -31,7 +31,7 @@ keymap_path=$script_path/../../keymap publish_path=$script_path/$publish_dir release_path=$script_path/../../output/mac/release -export PATH=$PATH:$ENV_QT_CLANG/bin +export PATH=$ENV_QT_CLANG/bin:$PATH if [ -d "$publish_path" ]; then rm -rf $publish_path @@ -82,4 +82,4 @@ echo --------------------------------------------------------------- # 恢复当前目录 cd $old_cd -exit 0 \ No newline at end of file +exit 0 From b2cb07c9e05b1bc0f579b50a837a203ba2b28d99 Mon Sep 17 00:00:00 2001 From: rankun Date: Fri, 28 Feb 2020 11:04:52 +0800 Subject: [PATCH 09/10] chore: add ubuntu build script --- .github/workflows/ubuntu.yml | 51 +++++++++++++++++++ ...build_for_linux.sh => build_for_ubuntu.sh} | 0 ...or_linux.sh => publish_for_ubuntu.sh.todo} | 0 3 files changed, 51 insertions(+) create mode 100644 .github/workflows/ubuntu.yml rename ci/linux/{build_for_linux.sh => build_for_ubuntu.sh} (100%) mode change 100755 => 100644 rename ci/linux/{publish_for_linux.sh => publish_for_ubuntu.sh.todo} (100%) mode change 100755 => 100644 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml new file mode 100644 index 0000000..257d02d --- /dev/null +++ b/.github/workflows/ubuntu.yml @@ -0,0 +1,51 @@ +name: Ubuntu +# Qt官方没有linux平台的x86包 +on: + push: + paths: + - 'QtScrcpy/**' + - '!QtScrcpy/res/**' + - '.github/workflows/**' + pull_request: + paths: + - 'QtScrcpy/**' + - '!QtScrcpy/res/**' +jobs: + build: + name: Build + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-16.04,ubuntu-18.04] + qt_ver: [5.12.6] + qt_arch: [gcc_64] + steps: + - name: Cache Qt + id: UbuntuCacheQt + uses: actions/cache@v1 + with: + path: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} + key: ${{ runner.os }}-Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} + - name: Setup Qt + if: steps.UbuntuCacheQt.outputs.cache-hit == 'true' + shell: pwsh + env: + QtPath: ../Qt/${{matrix.qt_ver}}/${{matrix.qt_arch}} + run: | + $qt_Path=${env:QtPath} + echo "::set-env name=Qt5_Dir::$qt_Path" + echo "::add-path::$qt_Path/bin" + - name: Install Qt + if: steps.UbuntuCacheQt.outputs.cache-hit != 'true' + uses: jurplel/install-qt-action@v2.0.0 + with: + version: ${{ matrix.qt_ver }} + - name: Ubuntu install GL library + run: sudo apt-get install -y libglew-dev libglfw3-dev + - uses: actions/checkout@v1 + with: + fetch-depth: 1 + - name: Build Ubuntu + run: | + export ENV_QT_GCC=$(pwd)/${{env.Qt5_Dir}} + ci/linux/build_for_ubuntu.sh release \ No newline at end of file diff --git a/ci/linux/build_for_linux.sh b/ci/linux/build_for_ubuntu.sh old mode 100755 new mode 100644 similarity index 100% rename from ci/linux/build_for_linux.sh rename to ci/linux/build_for_ubuntu.sh diff --git a/ci/linux/publish_for_linux.sh b/ci/linux/publish_for_ubuntu.sh.todo old mode 100755 new mode 100644 similarity index 100% rename from ci/linux/publish_for_linux.sh rename to ci/linux/publish_for_ubuntu.sh.todo From 3f8a11d9bdde90d3da0af814daab9d24f76cb5df Mon Sep 17 00:00:00 2001 From: Unknown <870709864@qq.com> Date: Fri, 28 Feb 2020 11:17:03 +0800 Subject: [PATCH 10/10] chore: fix build on ubuntu --- .github/workflows/ubuntu.yml | 4 ++-- ci/linux/build_for_ubuntu.sh | 0 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 ci/linux/build_for_ubuntu.sh diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 257d02d..9058610 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -47,5 +47,5 @@ jobs: fetch-depth: 1 - name: Build Ubuntu run: | - export ENV_QT_GCC=$(pwd)/${{env.Qt5_Dir}} - ci/linux/build_for_ubuntu.sh release \ No newline at end of file + export ENV_QT_GCC=${{env.Qt5_Dir}} + ci/linux/build_for_ubuntu.sh release diff --git a/ci/linux/build_for_ubuntu.sh b/ci/linux/build_for_ubuntu.sh old mode 100644 new mode 100755