summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-07-27 12:45:25 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-07-27 12:45:54 +0200
commit034cff469380ae9475842ddaa74164aae2d9ae24 (patch)
tree8f17d34c60842b10aedd44b080786797fd1ebe3d /tests
parentb4bb1e97b8bb2abfd8360c4d8315940791a893a8 (diff)
parent7f07ec41abb8194cafa19863af183e5e7f971edf (diff)
downloadqt-creator-034cff469380ae9475842ddaa74164aae2d9ae24.tar.gz
Merge remote-tracking branch 'origin/4.0' into 4.1
Change-Id: I71d3064a5f65ec658a7ecf248bdce0a3aeea89f4
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/proparser/main.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/manual/proparser/main.cpp b/tests/manual/proparser/main.cpp
index 4555383b7b..60067fd92d 100644
--- a/tests/manual/proparser/main.cpp
+++ b/tests/manual/proparser/main.cpp
@@ -189,6 +189,8 @@ int main(int argc, char **argv)
qCritical("usage: testreader [-v] [-d [-d]] [-c] <filenme> [<out_pwd>] [<variable assignments>]");
return 3;
}
+ option.commitCommandLineArguments(state);
+ option.useEnvironment();
if (out_pwd.isEmpty())
out_pwd = in_pwd;
option.setDirectories(in_pwd, out_pwd);