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
Marco Bubke
flatpak-qt-creator
Commits
16e9d050
Commit
16e9d050
authored
Jul 28, 2010
by
ck
Browse files
Maemo: Always show correct package path.
We now react to the build directory being changed. Reviewed-by: kh1
parent
f1253b7f
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
View file @
16e9d050
...
...
@@ -78,6 +78,7 @@ MaemoPackageCreationStep::MaemoPackageCreationStep(BuildConfiguration *buildConf
m_packagingEnabled
(
true
),
m_versionString
(
DefaultVersionNumber
)
{
ctor
();
}
MaemoPackageCreationStep
::
MaemoPackageCreationStep
(
BuildConfiguration
*
buildConfig
,
...
...
@@ -86,12 +87,19 @@ MaemoPackageCreationStep::MaemoPackageCreationStep(BuildConfiguration *buildConf
m_packagingEnabled
(
other
->
m_packagingEnabled
),
m_versionString
(
other
->
m_versionString
)
{
ctor
();
}
MaemoPackageCreationStep
::~
MaemoPackageCreationStep
()
{
}
void
MaemoPackageCreationStep
::
ctor
()
{
connect
(
buildConfiguration
(),
SIGNAL
(
buildDirectoryChanged
()),
this
,
SIGNAL
(
packageFilePathChanged
()));
}
bool
MaemoPackageCreationStep
::
init
()
{
return
true
;
...
...
@@ -367,6 +375,7 @@ QString MaemoPackageCreationStep::versionString() const
void
MaemoPackageCreationStep
::
setVersionString
(
const
QString
&
version
)
{
m_versionString
=
version
;
emit
packageFilePathChanged
();
}
QString
MaemoPackageCreationStep
::
nativePath
(
const
QFile
&
file
)
const
...
...
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.h
View file @
16e9d050
...
...
@@ -75,6 +75,9 @@ public:
QString
versionString
()
const
;
void
setVersionString
(
const
QString
&
version
);
signals:
void
packageFilePathChanged
();
private
slots
:
void
handleBuildOutput
();
...
...
@@ -82,6 +85,7 @@ private:
MaemoPackageCreationStep
(
ProjectExplorer
::
BuildConfiguration
*
buildConfig
,
MaemoPackageCreationStep
*
other
);
void
ctor
();
virtual
bool
init
();
virtual
void
run
(
QFutureInterface
<
bool
>
&
fi
);
virtual
ProjectExplorer
::
BuildStepConfigWidget
*
createConfigWidget
();
...
...
src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
View file @
16e9d050
...
...
@@ -66,6 +66,8 @@ MaemoPackageCreationWidget::MaemoPackageCreationWidget(MaemoPackageCreationStep
m_ui
->
minor
->
setValue
(
list
.
value
(
1
,
QLatin1String
(
"0"
)).
toInt
());
m_ui
->
patch
->
setValue
(
list
.
value
(
2
,
QLatin1String
(
"0"
)).
toInt
());
versionInfoChanged
();
connect
(
m_step
,
SIGNAL
(
packageFilePathChanged
()),
this
,
SIGNAL
(
updateSummary
()));
}
void
MaemoPackageCreationWidget
::
init
()
...
...
@@ -94,7 +96,6 @@ void MaemoPackageCreationWidget::versionInfoChanged()
{
m_step
->
setVersionString
(
m_ui
->
major
->
text
()
+
QLatin1Char
(
'.'
)
+
m_ui
->
minor
->
text
()
+
QLatin1Char
(
'.'
)
+
m_ui
->
patch
->
text
());
emit
updateSummary
();
}
}
// namespace Internal
...
...
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