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

Maemo: Several Meego fixes.

Browse Source 
- Deploy to sysroot via xrpm in case of RPM-based target.
- Set sensible default attributes in spec file.
- Add "/usr" to spec file as default. Should suffice in the common case.
- Adapt target removal message to fit the RPM case as well.
This commit is contained in:
Christian Kandeler
2011-02-01 14:05:28 +01:00
parent eeedd340a8
commit ad905869fe
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
View File

@@ -613,7 +613,9 @@ void MaemoDeployStep::installToSysroot()
const Qt4BuildConfiguration * const bc const Qt4BuildConfiguration * const bc
= static_cast<Qt4BuildConfiguration *>(buildConfiguration()); = static_cast<Qt4BuildConfiguration *>(buildConfiguration());
const QtVersion * const qtVersion = bc->qtVersion(); const QtVersion * const qtVersion = bc->qtVersion();
const QStringList args = QStringList() << QLatin1String("xdpkg") const QString command = QLatin1String(
packagingStep()->debBasedMaemoTarget() ? "xdpkg" : "xrpm");
const QStringList args = QStringList() << command
<< QLatin1String("-i") << packagingStep()->packageFilePath(); << QLatin1String("-i") << packagingStep()->packageFilePath();
MaemoGlobal::callMadAdmin(*m_sysrootInstaller, args, qtVersion, true); MaemoGlobal::callMadAdmin(*m_sysrootInstaller, args, qtVersion, true);
if (!m_sysrootInstaller->waitForStarted()) { if (!m_sysrootInstaller->waitForStarted()) {

1
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -305,6 +305,7 @@ QString MaemoRunConfiguration::remoteExecutableFilePath() const
: QString(); : QString();
} }
// TODO: Move to deploy step
MaemoPortList MaemoRunConfiguration::freePorts() const MaemoPortList MaemoRunConfiguration::freePorts() const
{ {
const Qt4BuildConfiguration * const qt4bc = activeQt4BuildConfiguration(); const Qt4BuildConfiguration * const qt4bc = activeQt4BuildConfiguration();

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

@@ -248,7 +248,7 @@ void AbstractQt4MaemoTarget::handleTargetToBeRemoved(ProjectExplorer::Target *ta
if (!targetCanBeRemoved()) if (!targetCanBeRemoved())
return; return;
const int answer = QMessageBox::warning(0, tr("Qt Creator"), const int answer = QMessageBox::warning(0, tr("Qt Creator"),
tr("Do you want to remove the packaging directory\n" tr("Do you want to remove the packaging file(s) "
"associated with the target '%1'?").arg(displayName()), "associated with the target '%1'?").arg(displayName()),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No); QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
if (answer == QMessageBox::No) if (answer == QMessageBox::No)
@@ -909,7 +909,9 @@ bool AbstractRpmBasedQt4MaemoTarget::createSpecialTemplates()
"BuildRequires: \n" "BuildRequires: \n"
"# %define _unpackaged_files_terminate_build 0\n" "# %define _unpackaged_files_terminate_build 0\n"
"%files\n" "%files\n"
"# Add files to be included in the package here.\n" "%defattr(-,root,root,-)"
"/usr\n"
"# Add additional files to be included in the package here.\n"
"%pre\n" "%pre\n"
"# Add pre-install scripts here." "# Add pre-install scripts here."
"%post\n" "%post\n"