Accept -run-tool if and only if the tool wasn't already selected
authorThiago Macieira <thiago.macieira@intel.com>
Fri, 21 Dec 2012 00:01:21 +0000 (16:01 -0800)
committerThiago Macieira <thiago.macieira@intel.com>
Fri, 18 Jan 2013 11:57:58 +0000 (12:57 +0100)
commit8e5e765eae4af7a2cf68da07d999e1c62d196e4a
tree725ac99ed948e9b0da369778e5db30c248fa59e5
parente69cda9f13fa47d4c5ab0c34ed7592563ab90770
Accept -run-tool if and only if the tool wasn't already selected

That means we invert the order of overriding. Previously, -run-tool
overrode the environment, which overrode argv[0]. Now, argv[0] overrides
the environment, which overrides -run-tool.

Change-Id: I60bd5e1397cb5a6cb8b0df9c1c3ebba6210ed920
Reviewed-by: Sune Vuorela <sune@vuorela.dk>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/qtchooser/main.cpp
tests/auto/qtchooser/tst_qtchooser.cpp