OSDN Git Service

Maemo: Manually add "execute" bit to debian/rules file.
authorChristian Kandeler <christian.kandeler@nokia.com>
Fri, 3 Dec 2010 15:57:25 +0000 (16:57 +0100)
committercon <qtc-committer@nokia.com>
Mon, 6 Dec 2010 10:50:18 +0000 (11:50 +0100)
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
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp

index 2808520..871cd46 100644 (file)
@@ -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);