summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels Weber <niels.2.weber@nokia.com>2012-08-03 09:22:27 +0200
committerNiels Weber <niels.2.weber@nokia.com>2012-08-03 09:59:35 +0200
commit0188b08e8dc218fb66f59522ffa7c02643a9577a (patch)
treec715dafe10746cbd2e6e3258977a57d912a794d3
parent3feb0423be4a5da6412a7e860476363b9b6f3b62 (diff)
Make all Ubuntu versions use cleanlooks style.
Doesn't make any sense to limit this to specific versions as the old ones go away anyway and all new ones exhibit this issue. Change-Id: I20fb4d13f2d1933c92fa09727f3d467d5210d24f Reviewed-by: Rainer Keller <rainer.keller@nokia.com> Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
-rw-r--r--src/sdk/installerbase.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp
index d73040e77..0509f9cab 100644
--- a/src/sdk/installerbase.cpp
+++ b/src/sdk/installerbase.cpp
@@ -92,21 +92,18 @@ int main(int argc, char *argv[])
{
QStringList args = QInstaller::parseCommandLineArgs(argc, argv);
-// hack to use cleanlooks if it is under Ubuntu 11.10
+// hack to use cleanlooks if it is under Ubuntu
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
std::string standardString;
std::string cleanLooks ="-style=cleanlooks";
std::ifstream input("/etc/lsb-release");
bool isUbuntu = false;
- bool is11_10 = false;
while (std::getline(input, standardString)) {
if (standardString == "DISTRIB_ID=Ubuntu")
isUbuntu = true;
- else if ((standardString == "DISTRIB_RELEASE=11.10") || (standardString == "DISTRIB_RELEASE=12.04"))
- is11_10 = true;
}
- if (isUbuntu && is11_10) {
+ if (isUbuntu) {
argc++;
char **newArgv = new char* [argc];
newArgv[0] = argv[0];