summaryrefslogtreecommitdiffstats
path: root/installerbuilder/installerbase/installerbase.cpp
diff options
context:
space:
mode:
authorkh1 <qt-info@nokia.com>2011-06-09 15:51:35 +0200
committerkh1 <qt-info@nokia.com>2011-06-09 15:51:35 +0200
commit2f76befcbbd1fec93a5ee4d7910ca9ec9112b183 (patch)
tree744b360e8d65ed797ae8dcc608ea10eb19997c29 /installerbuilder/installerbase/installerbase.cpp
parent2a5675823c6f633308908777925ac951b27ae269 (diff)
parent75a8626124d1b86ded4ffb2a4f7548d3f515bc60 (diff)
Merge branch 'master' into refactor
Conflicts: installerbuilder/installerbase/installerbase.cpp
Diffstat (limited to 'installerbuilder/installerbase/installerbase.cpp')
-rw-r--r--installerbuilder/installerbase/installerbase.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp
index 1611cebe8..fae0c3d42 100644
--- a/installerbuilder/installerbase/installerbase.cpp
+++ b/installerbuilder/installerbase/installerbase.cpp
@@ -261,7 +261,6 @@ int main(int argc, char *argv[])
verbose() << "Use no-force-installations" << std::endl;
} else {
std::cerr << "Unknown option: " << argument << std::endl;
- return Installer::Failure;
}
}