From b74eb892c6fa96f7e13faa28b462dca1d78ecd6d Mon Sep 17 00:00:00 2001 From: Christian Kandeler <christian.kandeler@nokia.com> Date: Mon, 30 Aug 2010 12:54:16 +0200 Subject: [PATCH] Maemo: Partly revert 8fe7ac89405cbfc9f84dfe88d53c0a2af8b0e8e8. This is needed for sourve packages, but interferes with binary ones. --- .../qt-maemo/maemotemplatesmanager.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp index 3c56cf3cd5e..655204b1742 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp @@ -204,13 +204,13 @@ bool MaemoTemplatesManager::adaptRulesFile(const Project *project) rulesContents.replace("DESTDIR", "INSTALL_ROOT"); rulesContents.replace("dh_shlibdeps", "# dh_shlibdeps"); rulesContents.replace("dh_strip", "# dh_strip"); - rulesContents.replace("$(MAKE) clean", "# $(MAKE) clean"); - const Qt4Project * const qt4Project - = static_cast<const Qt4Project *>(project); - const QString proFileName - = QFileInfo(qt4Project->rootProjectNode()->path()).fileName(); - rulesContents.replace("# Add here commands to configure the package.", - "qmake " + proFileName.toLocal8Bit()); +// rulesContents.replace("$(MAKE) clean", "# $(MAKE) clean"); +// const Qt4Project * const qt4Project +// = static_cast<const Qt4Project *>(project); +// const QString proFileName +// = QFileInfo(qt4Project->rootProjectNode()->path()).fileName(); +// rulesContents.replace("# Add here commands to configure the package.", +// "qmake " + proFileName.toLocal8Bit()); // Would be the right solution, but does not work (on Windows), // because dpkg-genchanges doesn't know about it (and can't be told). -- GitLab