Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -1022,9 +1022,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1021 unmodified lines | |||
| 1022 | if (args.at(i) == TEST_SCRIPT_COMMAND && (i + 1) < args.size()) { | 1022 | if (args.at(i) == TEST_SCRIPT_COMMAND && (i + 1) < args.size()) { |
| 1023 | QString testScriptPath = args.at(i + 1); | 1023 | QString testScriptPath = args.at(i + 1); |
| 1024 | 1024 | ||
| 1025 | // If the URL scheme is "http(s)" then use as is, else - treat it as a local file | 1025 | // If the URL scheme is http(s) or ftp, then use as is, else - treat it as a local file |
| 1026 | // This is done so as not break previous command line scripts | 1026 | // This is done so as not break previous command line scripts |
| 1027 | if (testScriptPath.left(4) == "http") { | 1027 | if (testScriptPath.left(URL_SCHEME_HTTP.length()) == URL_SCHEME_HTTP || testScriptPath.left(URL_SCHEME_FTP.length()) == URL_SCHEME_FTP) { |
| 1028 | setProperty(hifi::properties::TEST, QUrl::fromUserInput(testScriptPath)); | 1028 | setProperty(hifi::properties::TEST, QUrl::fromUserInput(testScriptPath)); |
| 1029 | } else if (QFileInfo(testScriptPath).exists()) { | 1029 | } else if (QFileInfo(testScriptPath).exists()) { |
| 1030 | setProperty(hifi::properties::TEST, QUrl::fromLocalFile(testScriptPath)); | 1030 | setProperty(hifi::properties::TEST, QUrl::fromLocalFile(testScriptPath)); |