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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
This commit is contained in:
con
2011-01-12 10:20:46 +01:00
parent a444cdc7aa 9a7e4865a5
commit f46a87a6f5
7 changed files with 216 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qt4projectmanager/qt-maemo/maemotemplatesmanager.cpp
View File

@@ -250,7 +250,8 @@ bool MaemoTemplatesManager::adaptRulesFile(const Project *project)
}
QByteArray rulesContents = rulesFile.readAll();
rulesContents.replace("DESTDIR", "INSTALL_ROOT");
rulesContents.replace("dh_shlibdeps", "# dh_shlibdeps");
rulesContents.replace("dh_shlibdeps",
"# dh_shlibdeps # Uncomment this line for publishing!");
// rulesContents.replace("$(MAKE) clean", "# $(MAKE) clean");
// const Qt4Project * const qt4Project
// = static_cast<const Qt4Project *>(project);