Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
flatpak-qt-creator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
54667668
Commit
54667668
authored
Nov 30, 2010
by
Christian Kandeler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Maemo: Only add target deployment for the current toolchain.
Task-number: QTCREATORBUG-3222
parent
cead4f39
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
21 deletions
+14
-21
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
...s/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
+13
-21
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h
...ins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h
+1
-0
No files found.
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
View file @
54667668
...
...
@@ -76,27 +76,11 @@ bool MaemoDeployableListModel::buildModel()
const
QString
remoteDirSuffix
=
QLatin1String
(
m_projectType
==
LibraryTemplate
?
"/lib"
:
"/bin"
);
const
QString
remoteDirMaemo5
=
QLatin1String
(
"/opt/usr"
)
+
remoteDirSuffix
;
const
QString
remoteDirMaemo6
=
QLatin1String
(
"/usr/local"
)
+
remoteDirSuffix
;
m_deployables
.
prepend
(
MaemoDeployable
(
localExecutableFilePath
(),
remoteDirMaemo5
));
QFile
projectFile
(
m_proFilePath
);
if
(
!
projectFile
.
open
(
QIODevice
::
WriteOnly
|
QIODevice
::
Append
))
{
qWarning
(
"Error updating .pro file."
);
return
false
;
}
QString
proFileTemplate
=
QLatin1String
(
"
\n
unix:!symbian {
\n
"
" maemo5 {
\n
target.path = maemo5path
\n
} else {
\n
"
" target.path = maemo6path
\n
}
\n
"
" INSTALLS += target
\n
}"
);
proFileTemplate
.
replace
(
QLatin1String
(
"maemo5path"
),
remoteDirMaemo5
);
proFileTemplate
.
replace
(
QLatin1String
(
"maemo6path"
),
remoteDirMaemo6
);
if
(
!
projectFile
.
write
(
proFileTemplate
.
toLocal8Bit
()))
{
qWarning
(
"Error updating .pro file."
);
return
false
;
}
const
QString
remoteDir
=
QLatin1String
(
"target.path = "
)
+
installPrefix
()
+
remoteDirSuffix
;
const
QStringList
deployInfo
=
QStringList
()
<<
remoteDir
<<
QLatin1String
(
"INSTALLS += target"
);
return
addLinesToProFile
(
deployInfo
);
}
else
{
m_deployables
.
prepend
(
MaemoDeployable
(
localExecutableFilePath
(),
m_installsList
.
targetPath
));
...
...
@@ -370,5 +354,13 @@ QString MaemoDeployableListModel::proFileScope() const
?
"maemo5"
:
"unix:!symbian:!maemo5"
);
}
QString
MaemoDeployableListModel
::
installPrefix
()
const
{
const
MaemoToolChain
*
const
tc
=
maemoToolchain
();
QTC_ASSERT
(
tc
,
return
QString
());
return
QLatin1String
(
tc
->
version
()
==
MaemoToolChain
::
Maemo5
?
"/opt/usr"
:
"/usr/local"
);
}
}
// namespace Qt4ProjectManager
}
// namespace Internal
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.h
View file @
54667668
...
...
@@ -95,6 +95,7 @@ private:
bool
addLinesToProFile
(
const
QStringList
&
lines
);
const
MaemoToolChain
*
maemoToolchain
()
const
;
QString
proFileScope
()
const
;
QString
installPrefix
()
const
;
const
Qt4ProjectType
m_projectType
;
const
QString
m_proFilePath
;
...
...
Write
Preview
Markdown
is supported
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