Merge javascript changes from stable branch

This commit is contained in:
Christophe Dumez 2010-06-07 13:41:32 +00:00
parent 61246f81c7
commit 4386b6c2c4
5 changed files with 147 additions and 134 deletions

View file

@ -105,7 +105,7 @@ QList<QVariantMap> EventManager::getPropFilesInfo(QString hash) const {
int i=0;
for(fi=t.begin_files(); fi != t.end_files(); fi++) {
QVariantMap file;
QString path = QDir::cleanPath(misc::toQString(fi->path.string()));
QString path = QDir::cleanPath(misc::toQStringU(fi->path.string()));
QString name = path.split('/').last();
file["name"] = name;
file["size"] = misc::friendlyUnit((double)fi->size);