Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
62d052cb
Commit
62d052cb
authored
Apr 15, 2011
by
Christian Kandeler
Browse files
Maemo: Fix section name in Debian control file.
It's "user/other" for Harmattan, apparently...
parent
dfce840d
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.cpp
View file @
62d052cb
...
...
@@ -846,7 +846,7 @@ bool AbstractDebBasedQt4MaemoTarget::adaptControlFile()
QByteArray
controlContents
=
controlFile
.
readAll
();
adaptControlFileField
(
controlContents
,
"Section"
,
"user/hidden"
);
adaptControlFileField
(
controlContents
,
"Section"
,
defaultSection
()
);
adaptControlFileField
(
controlContents
,
"Priority"
,
"optional"
);
adaptControlFileField
(
controlContents
,
packageManagerNameFieldName
(),
project
()
->
displayName
().
toUtf8
());
...
...
@@ -1124,6 +1124,11 @@ QByteArray Qt4Maemo5Target::packageManagerNameFieldName() const
return
"XB-Maemo-Display-Name"
;
}
QByteArray
Qt4Maemo5Target
::
defaultSection
()
const
{
return
"user/hidden"
;
}
Qt4HarmattanTarget
::
Qt4HarmattanTarget
(
Qt4Project
*
parent
,
const
QString
&
id
)
:
AbstractDebBasedQt4MaemoTarget
(
parent
,
id
)
{
...
...
@@ -1155,6 +1160,11 @@ QByteArray Qt4HarmattanTarget::packageManagerNameFieldName() const
return
"XSBC-Maemo-Display-Name"
;
}
QByteArray
Qt4HarmattanTarget
::
defaultSection
()
const
{
return
"user/other"
;
}
Qt4MeegoTarget
::
Qt4MeegoTarget
(
Qt4Project
*
parent
,
const
QString
&
id
)
:
AbstractRpmBasedQt4MaemoTarget
(
parent
,
id
)
...
...
src/plugins/qt4projectmanager/qt-maemo/qt4maemotarget.h
View file @
62d052cb
...
...
@@ -177,6 +177,7 @@ private:
virtual
void
addAdditionalControlFileFields
(
QByteArray
&
controlContents
)
=
0
;
virtual
QByteArray
packageManagerNameFieldName
()
const
=
0
;
virtual
QByteArray
defaultSection
()
const
=
0
;
QString
changeLogFilePath
()
const
;
QString
controlFilePath
()
const
;
...
...
@@ -251,6 +252,7 @@ private:
virtual
void
addAdditionalControlFileFields
(
QByteArray
&
controlContents
);
virtual
QString
debianDirName
()
const
;
virtual
QByteArray
packageManagerNameFieldName
()
const
;
virtual
QByteArray
defaultSection
()
const
;
};
...
...
@@ -271,6 +273,7 @@ private:
virtual
void
addAdditionalControlFileFields
(
QByteArray
&
controlContents
);
virtual
QString
debianDirName
()
const
;
virtual
QByteArray
packageManagerNameFieldName
()
const
;
virtual
QByteArray
defaultSection
()
const
;
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment