feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Maemo: Fix section name in Debian control file.

Browse Source 
It's "user/other" for Harmattan, apparently...
This commit is contained in:
Christian Kandeler
2011-04-15 17:06:34 +02:00
parent dfce840d3e
commit 62d052cb08
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
View File

@@ -846,7 +846,7 @@ bool AbstractDebBasedQt4MaemoTarget::adaptControlFile()
QByteArray controlContents = controlFile.readAll(); QByteArray controlContents = controlFile.readAll();
adaptControlFileField(controlContents, "Section", "user/hidden"); adaptControlFileField(controlContents, "Section", defaultSection());
adaptControlFileField(controlContents, "Priority", "optional"); adaptControlFileField(controlContents, "Priority", "optional");
adaptControlFileField(controlContents, packageManagerNameFieldName(), adaptControlFileField(controlContents, packageManagerNameFieldName(),
project()->displayName().toUtf8()); project()->displayName().toUtf8());
@@ -1124,6 +1124,11 @@ QByteArray Qt4Maemo5Target::packageManagerNameFieldName() const
return "XB-Maemo-Display-Name"; return "XB-Maemo-Display-Name";
} }
QByteArray Qt4Maemo5Target::defaultSection() const
{
return "user/hidden";
}
Qt4HarmattanTarget::Qt4HarmattanTarget(Qt4Project *parent, const QString &id) Qt4HarmattanTarget::Qt4HarmattanTarget(Qt4Project *parent, const QString &id)
: AbstractDebBasedQt4MaemoTarget(parent, id) : AbstractDebBasedQt4MaemoTarget(parent, id)
{ {
@@ -1155,6 +1160,11 @@ QByteArray Qt4HarmattanTarget::packageManagerNameFieldName() const
return "XSBC-Maemo-Display-Name"; return "XSBC-Maemo-Display-Name";
} }
QByteArray Qt4HarmattanTarget::defaultSection() const
{
return "user/other";
}
Qt4MeegoTarget::Qt4MeegoTarget(Qt4Project *parent, const QString &id) Qt4MeegoTarget::Qt4MeegoTarget(Qt4Project *parent, const QString &id)
: AbstractRpmBasedQt4MaemoTarget(parent, id) : AbstractRpmBasedQt4MaemoTarget(parent, id)

3
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
View File

@@ -177,6 +177,7 @@ private:
virtual void addAdditionalControlFileFields(QByteArray &controlContents)=0; virtual void addAdditionalControlFileFields(QByteArray &controlContents)=0;
virtual QByteArray packageManagerNameFieldName() const=0; virtual QByteArray packageManagerNameFieldName() const=0;
virtual QByteArray defaultSection() const=0;
QString changeLogFilePath() const; QString changeLogFilePath() const;
QString controlFilePath() const; QString controlFilePath() const;
@@ -251,6 +252,7 @@ private:
virtual void addAdditionalControlFileFields(QByteArray &controlContents); virtual void addAdditionalControlFileFields(QByteArray &controlContents);
virtual QString debianDirName() const; virtual QString debianDirName() const;
virtual QByteArray packageManagerNameFieldName() const; virtual QByteArray packageManagerNameFieldName() const;
virtual QByteArray defaultSection() const;
}; };
@@ -271,6 +273,7 @@ private:
virtual void addAdditionalControlFileFields(QByteArray &controlContents); virtual void addAdditionalControlFileFields(QByteArray &controlContents);
virtual QString debianDirName() const; virtual QString debianDirName() const;
virtual QByteArray packageManagerNameFieldName() const; virtual QByteArray packageManagerNameFieldName() const;
virtual QByteArray defaultSection() const;
}; };