Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
d54673c0
Commit
d54673c0
authored
Jun 29, 2010
by
ck
Browse files
Maemo: Fix incorrect assumption about build directory.
Reviewed-by: kh1
parent
c55a4753
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
View file @
d54673c0
...
...
@@ -148,7 +148,7 @@ bool MaemoPackageCreationStep::createPackage()
env
.
insert
(
key
,
path
%
QLatin1String
(
"madbin"
)
%
colon
%
env
.
value
(
key
));
env
.
insert
(
QLatin1String
(
"PERL5LIB"
),
path
%
QLatin1String
(
"madlib/perl5"
));
const
QString
buildDir
=
QFileInfo
(
localExecutableFilePath
()).
absolutePath
();
const
QString
buildDir
=
buildDirectory
();
env
.
insert
(
QLatin1String
(
"PWD"
),
buildDir
);
const
QRegExp
envPattern
(
QLatin1String
(
"([^=]+)=[
\"
']?([^;
\"
']+)[
\"
']? ;.*"
));
...
...
@@ -288,6 +288,13 @@ QString MaemoPackageCreationStep::localExecutableFilePath() const
+
QLatin1Char
(
'/'
)
+
ti
.
target
));
}
QString
MaemoPackageCreationStep
::
buildDirectory
()
const
{
const
TargetInformation
&
ti
=
qt4BuildConfiguration
()
->
qt4Target
()
->
qt4Project
()
->
rootProjectNode
()
->
targetInformation
();
return
ti
.
valid
?
ti
.
buildDir
:
QString
();
}
QString
MaemoPackageCreationStep
::
executableFileName
()
const
{
return
QFileInfo
(
localExecutableFilePath
()).
fileName
();
...
...
@@ -326,8 +333,7 @@ bool MaemoPackageCreationStep::packagingNeeded() const
QString
MaemoPackageCreationStep
::
packageFilePath
()
const
{
QFileInfo
execInfo
(
localExecutableFilePath
());
return
execInfo
.
path
()
%
QDir
::
separator
()
%
execInfo
.
fileName
().
toLower
()
return
buildDirectory
()
%
QDir
::
separator
()
%
executableFileName
().
toLower
()
%
QLatin1Char
(
'_'
)
%
versionString
()
%
QLatin1String
(
"_armel.deb"
);
}
...
...
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
View file @
d54673c0
...
...
@@ -95,6 +95,7 @@ private:
bool
packagingNeeded
()
const
;
void
raiseError
(
const
QString
&
shortMsg
,
const
QString
&
detailedMsg
=
QString
());
QString
buildDirectory
()
const
;
static
const
QLatin1String
CreatePackageId
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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