Merge remote branch 'origin/2.2'

This commit is contained in:
con
2011-04-20 11:07:25 +02:00
16 changed files with 9482 additions and 1456 deletions

View File

@@ -1087,8 +1087,7 @@ QString Qt4HarmattanTarget::defaultDisplayName()
void Qt4HarmattanTarget::addAdditionalControlFileFields(QByteArray &controlContents)
{
adaptControlFileField(controlContents, "XB-Meego-Desktop-Entry", "");
adaptControlFileField(controlContents, "XB-MeeGo-Desktop-Entry-Filename", "");
Q_UNUSED(controlContents);
}
QString Qt4HarmattanTarget::debianDirName() const