diff options
author | Tim Jenssen <tim.jenssen@nokia.com> | 2011-12-13 10:38:02 +0100 |
---|---|---|
committer | Tim Jenssen <tim.jenssen@nokia.com> | 2011-12-13 11:54:52 +0100 |
commit | 75fcb2cbc0ad54d91e446150f10954a294d90bfe (patch) | |
tree | 33993a56cd2bda709b073566370678a506c7ff65 /installerbuilder/installerbase/installerbase.cpp | |
parent | 723e79a7204b3cd8b96e031af07347fd0cce176c (diff) |
fix the hack that uses cleanlooks under Ubuntu 11.10
- count wasn't the right position in the array
- and don't ignore style from commandline
Change-Id: I8bc5f169c51adafeb333b0872bb5adbde59d01e7
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Diffstat (limited to 'installerbuilder/installerbase/installerbase.cpp')
-rw-r--r-- | installerbuilder/installerbase/installerbase.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp index ae4111a88..9cb542c43 100644 --- a/installerbuilder/installerbase/installerbase.cpp +++ b/installerbuilder/installerbase/installerbase.cpp @@ -103,12 +103,13 @@ int main(int argc, char *argv[]) } if (isUbuntu && is11_10) { - char** newArgv = new char* [argc + 1]; - for (int i = 0; i < argc; ++i) { - newArgv[i] = argv[i]; - } argc++; - newArgv[argc] = const_cast<char*>(cleanLooks.data()); + char **newArgv = new char* [argc]; + newArgv[0] = argv[0]; + newArgv[1] = const_cast<char*>(cleanLooks.data()); + for (int i = 1; i < argc-1; ++i) { + newArgv[i+1] = argv[i]; + } argv = newArgv; } #endif |