From edcf121af0f21137d62ed843e354d321b3fca414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=89=E5=9D=A4?= Date: Mon, 6 Jun 2022 18:05:59 +0800 Subject: [PATCH] fix: mac build error --- QtScrcpy/CMakeLists.txt | 6 +++--- QtScrcpy/QtScrcpyCore/CMakeLists.txt | 16 ++++++++-------- QtScrcpy/QtScrcpyCore/src/device/device.h | 2 +- .../QtScrcpyCore/src/third_party/adb/linux/adb | Bin .../QtScrcpyCore/src/third_party/adb/mac/adb | Bin QtScrcpy/ui/dialog.cpp | 4 +--- all.pro | 7 ------- 7 files changed, 13 insertions(+), 22 deletions(-) mode change 100644 => 100755 QtScrcpy/QtScrcpyCore/src/third_party/adb/linux/adb mode change 100644 => 100755 QtScrcpy/QtScrcpyCore/src/third_party/adb/mac/adb delete mode 100644 all.pro diff --git a/QtScrcpy/CMakeLists.txt b/QtScrcpy/CMakeLists.txt index 71e6eb0..62b09da 100755 --- a/QtScrcpy/CMakeLists.txt +++ b/QtScrcpy/CMakeLists.txt @@ -246,13 +246,13 @@ endif() if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") # copy bundle file get_target_property(MACOS_BUNDLE_PATH ${PROJECT_NAME} RUNTIME_OUTPUT_DIRECTORY) - set(MACOS_BUNDLE_PATH ${MACOS_BUNDLE_PATH}/${QSC_PROJECT_NAME}.app/Contents) + set(MACOS_BUNDLE_PATH ${MACOS_BUNDLE_PATH}/${PROJECT_NAME}.app/Contents) set(QSC_DEPLOY_PATH ${MACOS_BUNDLE_PATH}) - add_custom_command(TARGET ${QSC_PROJECT_NAME} POST_BUILD + add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD # config file copy to Contents/MacOS/config - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../config/config.ini" "${MACOS_BUNDLE_PATH}/MacOS/config" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/../config/config.ini" "${MACOS_BUNDLE_PATH}/MacOS/config/config.ini" ) # Step 2. ues MACOSX_PACKAGE_LOCATION copy icns to Resources diff --git a/QtScrcpy/QtScrcpyCore/CMakeLists.txt b/QtScrcpy/QtScrcpyCore/CMakeLists.txt index e183007..3ce42df 100644 --- a/QtScrcpy/QtScrcpyCore/CMakeLists.txt +++ b/QtScrcpy/QtScrcpyCore/CMakeLists.txt @@ -181,14 +181,14 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") # copy bundle file add_custom_command(TARGET ${QSC_PROJECT_NAME} POST_BUILD # dylib,scrcpy-server,adb copy to Contents/MacOS - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavcodec.58.dylib" "${QSC_DEPLOY_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavformat.58.dylib" "${QSC_DEPLOY_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavutil.56.dylib" "${QSC_DEPLOY_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswscale.5.dylib" "${QSC_DEPLOY_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswresample.3.dylib" "${QSC_DEPLOY_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavcodec.58.dylib" "${QSC_DEPLOY_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavformat.58.dylib" "${QSC_DEPLOY_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libavutil.56.dylib" "${QSC_DEPLOY_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswscale.5.dylib" "${QSC_DEPLOY_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib/libswresample.3.dylib" "${QSC_DEPLOY_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/scrcpy-server" "${QSC_DEPLOY_PATH}/MacOS" - COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/adb/mac/adb" "${QSC_DEPLOY_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/scrcpy-server" "${QSC_DEPLOY_PATH}/MacOS" + COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/adb/mac/adb" "${QSC_DEPLOY_PATH}/MacOS" ) endif() @@ -200,7 +200,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") # include target_include_directories(${QSC_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/include) # link - set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib") + set(FFMPEG_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}/src/third_party/ffmpeg/lib") target_link_directories(${QSC_PROJECT_NAME} PUBLIC ${FFMPEG_LIB_PATH}) target_link_libraries(${QSC_PROJECT_NAME} PRIVATE # ffmpeg diff --git a/QtScrcpy/QtScrcpyCore/src/device/device.h b/QtScrcpy/QtScrcpyCore/src/device/device.h index 180ceb3..492728c 100644 --- a/QtScrcpy/QtScrcpyCore/src/device/device.h +++ b/QtScrcpy/QtScrcpyCore/src/device/device.h @@ -87,7 +87,7 @@ private: QPointer m_controller; QPointer m_fileHandler; QPointer m_stream; - QPointer m_recorder = Q_NULLPTR; + QPointer m_recorder; QElapsedTimer m_startTimeCount; DeviceParams m_params; diff --git a/QtScrcpy/QtScrcpyCore/src/third_party/adb/linux/adb b/QtScrcpy/QtScrcpyCore/src/third_party/adb/linux/adb old mode 100644 new mode 100755 diff --git a/QtScrcpy/QtScrcpyCore/src/third_party/adb/mac/adb b/QtScrcpy/QtScrcpyCore/src/third_party/adb/mac/adb old mode 100644 new mode 100755 diff --git a/QtScrcpy/ui/dialog.cpp b/QtScrcpy/ui/dialog.cpp index b780b8c..1ee65e4 100644 --- a/QtScrcpy/ui/dialog.cpp +++ b/QtScrcpy/ui/dialog.cpp @@ -658,9 +658,7 @@ void Dialog::on_useSingleModeCheck_clicked() ui->rightWidget->show(); } - QTimer::singleShot(0, this, [this]() { - resize(layout()->sizeHint().width(), height()); - }); + resize(layout()->sizeHint().width(), height()); } void Dialog::on_serialBox_currentIndexChanged(const QString &arg1) diff --git a/all.pro b/all.pro deleted file mode 100644 index 86c354d..0000000 --- a/all.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS = QtScrcpy - -# 多语言翻译文件 -TRANSLATIONS = \ - $$PWD/QtScrcpy/res/i18n/zh_CN.ts \ - $$PWD/QtScrcpy/res/i18n/en_US.ts