aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@nokia.com>2010-12-03 16:57:25 +0100
committercon <qtc-committer@nokia.com>2010-12-06 11:50:18 +0100
commit31422318d638d8457d872ce1e7a4311ec78de87c (patch)
treeff1e573e3ae747e45642b475d74fd55ff595df45 /src
parenta5c4903ab27a2467054da89d695399fda9e6e408 (diff)
Maemo: Manually add "execute" bit to debian/rules file.
The file is expected to be executable on Linux. However, when it was created on Windows and checked into a repository, the bit will not be set when pulling it onto a Linux system, resulting in packaging failure. Task-number: QTCREATORBUG-3277 Reviewed-by: kh1 Reviewed-by: dt
Diffstat (limited to 'src')
-rw-r--r--src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
index 2808520c16..871cd461ba 100644
--- a/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
+++ b/src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
@@ -263,8 +263,12 @@ bool MaemoPackageCreationStep::copyDebianFiles(bool inSourceBuild)
}
// Workaround for Harmattan icon bug
- if (harmattanWorkaroundNeeded && fileName == QLatin1String("rules"))
- addWorkaroundForHarmattanBug(destFile);
+ if (fileName == QLatin1String("rules")) {
+ if (harmattanWorkaroundNeeded)
+ addWorkaroundForHarmattanBug(destFile);
+ QFile rulesFile(destFile);
+ rulesFile.setPermissions(rulesFile.permissions() | QFile::ExeUser);
+ }
}
QFile magicFile(magicFilePath);