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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
This commit is contained in:
con
2010-05-17 17:40:40 +02:00
parent d8318a9502 b52f3cb274
commit 38f6379f39
106 changed files with 1205 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -698,7 +698,7 @@ void S60DeviceRunControlBase::printConnectFailed(const QString &errorMessage)
void S60DeviceRunControlBase::printCopyingNotice()
{
emit appendMessage(this, tr("Copying install file..."), false);
emit appendMessage(this, tr("Copying installation file..."), false);
}
void S60DeviceRunControlBase::printCopyProgress(int progress)