Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gamera_videos_no_ui
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liusq
gamera_videos_no_ui
Commits
f26aa932
Commit
f26aa932
authored
Oct 10, 2024
by
郭峰
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-1007488' into 'release'
Feature 1007488 See merge request
!40
parents
de180a5b
5603d29d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
VidesData.h
+7
-6
gamera_videos.pro
+1
-0
No files found.
VidesData.h
View file @
f26aa932
...
...
@@ -488,20 +488,21 @@ inline bool pingAddress(const QString &address) {
#ifdef Q_OS_WIN
// Windows 指令 "ping IP -n 1 -w 超时(ms)"
QString
cmdstr
=
QString
(
"ping %1 -n 1 -w %2"
)
.
arg
(
address
).
arg
(
1000
)
;
QString
List
arguments
;
arguments
<<
"-c"
<<
"ping "
+
address
+
" -n 1 -w 1000"
;
#else
// Linux 指令 "ping -c 1 IP"
QString
cmdstr
=
QString
(
"ping -c 1 %1"
)
.
arg
(
address
)
;
QString
List
arguments
;
arguments
<<
"-c"
<<
"ping -c 1 "
+
address
;
#endif
// 启动进程
cmd
.
start
(
cmdstr
);
cmd
.
start
(
"bash"
,
arguments
);
// 等待进程准备好读取
if
(
!
cmd
.
waitForStarted
())
{
qWarning
()
<<
"Failed to start 'ping' process for"
<<
address
;
qWarning
()
<<
"无法启动的‘ping’进程"
<<
address
;
qWarning
()
<<
"命令: "
<<
arguments
.
join
(
" "
);
return
false
;
}
...
...
gamera_videos.pro
View file @
f26aa932
...
...
@@ -13,6 +13,7 @@ TEMPLATE = app
# deprecated API in order to know how to port your code away from it.
DEFINES
+=
QT_DEPRECATED_WARNINGS
DEFINES
+=
APP_VERSION
=
\\\
"1.3.2\\\"
DEFINES
+=
QT_MESSAGELOGCONTEXT
DEFINES
+=
QT_NO_DEBUG_OUTPUT
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment