Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
ckorn committed Feb 23, 2016
1 parent b42ca75 commit 903ce19
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion common.pri
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ defineReplace(shell_quote_win) {
# - control chars & space
# - the windows shell meta chars "&()<>^|
# - the potential separators ,;=
#TODO: how to deal with "^", "|"? every char are seperated by "|"?
#TODO: how to deal with "^", "|"? every char are separated by "|"?
#how to avoid replacing "^" again for the second time
isEmpty(1):error("shell_quote(arg) requires one argument.")
special_chars = & \( \) < >
Expand Down
2 changes: 1 addition & 1 deletion configure.pri
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ defineTest(cache) {
}
#log("varstr: $$varstr")
##TODO: remove existing lines contain $$srcvar
#because write_file() will write 1 line for each value(seperated by space), so the value must be closed with "", then it's 1 value, not list
#because write_file() will write 1 line for each value(separated by space), so the value must be closed with "", then it's 1 value, not list
#erase the existing var and value pair
win32 {#:isEmpty(QMAKE_SH) { #windows sucks. can not access the cache

Expand Down
2 changes: 1 addition & 1 deletion examples/common/common.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ QOptions get_common_options()
("height", 450, QLatin1String("height of player"))
("fullscreen", QLatin1String("fullscreen"))
("decoder", QLatin1String("FFmpeg"), QLatin1String("use a given decoder"))
("decoders,-vd", QLatin1String("cuda;vaapi;vda;dxva;cedarv;ffmpeg"), QLatin1String("decoder name list in priority order seperated by ';'"))
("decoders,-vd", QLatin1String("cuda;vaapi;vda;dxva;cedarv;ffmpeg"), QLatin1String("decoder name list in priority order separated by ';'"))
("file,f", QString(), QLatin1String("file or url to play"))
("language", QLatin1String("system"), QLatin1String("language on UI. can be 'system', 'none' and locale name e.g. zh_CN"))
("log", QString(), QLatin1String("log level. can be 'off', 'fatal', 'critical', 'warning', 'debug', 'all'"))
Expand Down
2 changes: 1 addition & 1 deletion qml/libQmlAV.pro
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)) {
for(f, plugin.files) {
plugin.commands += $$escape_expand(\\n\\t)$$TRY_COPY $$shell_path($$f) $$shell_path($$plugin.path)
}
#join values seperated by space. so quote is needed
#join values separated by space. so quote is needed
#plugin.commands = $$join(plugin.commands,$$escape_expand(\\n\\t))
OTHER_FILES += $$qtav_qml.files
#just append as a string to $$QMAKE_POST_LINK
Expand Down

0 comments on commit 903ce19

Please sign in to comment.