Skip to content

Commit 8abdc5c

Browse files
authored
Merge pull request #944 from barry-ran/dev
sync dev
2 parents 321913d + cf63962 commit 8abdc5c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2
-5382
lines changed

QtScrcpy/QtScrcpyCore

config/config.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ RenderExpiredFrames=0
1010
# 视频解码方式:-1 自动,0 软解,1 dx硬解,2 opengl硬解
1111
UseDesktopOpenGL=-1
1212
# scrcpy-server的版本号(不要修改)
13-
ServerVersion=2.1.1
13+
ServerVersion=2.4
1414
# scrcpy-server推送到安卓设备的路径
1515
ServerPath=/data/local/tmp/scrcpy-server.jar
1616
# 自定义adb路径,例如D:/android/tools/adb.exe

server/.gitignore

Lines changed: 0 additions & 8 deletions
This file was deleted.

server/build.gradle

Lines changed: 0 additions & 26 deletions
This file was deleted.

server/build_without_gradle.sh

Lines changed: 0 additions & 87 deletions
This file was deleted.

server/meson.build

Lines changed: 0 additions & 25 deletions
This file was deleted.

server/proguard-rules.pro

Lines changed: 0 additions & 21 deletions
This file was deleted.

server/scripts/build-wrapper.sh

Lines changed: 0 additions & 29 deletions
This file was deleted.

server/src/main/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
This file was deleted.

server/src/main/aidl/android/content/IOnPrimaryClipChangedListener.aidl

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)