From 903ce19322792a5ca707f8bc8117dbc9b7fa7811 Mon Sep 17 00:00:00 2001 From: Christoph Korn Date: Wed, 24 Feb 2016 00:07:43 +0100 Subject: [PATCH] Fix typos --- common.pri | 2 +- configure.pri | 2 +- examples/common/common.cpp | 2 +- qml/libQmlAV.pro | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common.pri b/common.pri index dfe3be2dc..4be0f979c 100644 --- a/common.pri +++ b/common.pri @@ -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 = & \( \) < > diff --git a/configure.pri b/configure.pri index 090681af9..afefef29c 100644 --- a/configure.pri +++ b/configure.pri @@ -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 diff --git a/examples/common/common.cpp b/examples/common/common.cpp index 88350ac17..c8bb0426d 100644 --- a/examples/common/common.cpp +++ b/examples/common/common.cpp @@ -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'")) diff --git a/qml/libQmlAV.pro b/qml/libQmlAV.pro index 06070f813..068b998a0 100644 --- a/qml/libQmlAV.pro +++ b/qml/libQmlAV.pro @@ -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