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

QmlDesigner.itemLibrary: use utf8 for filenames (not latin1)

Browse Source 
Task-number: QTCREATORBUG-4617
Change-Id: I6ff20816aa2800d4465a99ee69bdd871e6186a57
Reviewed-on: http://codereview.qt.nokia.com/1511
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Thomas Hartmann
2011-07-12 12:06:59 +02:00
parent 10557d76c0
commit c90ada79d9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/formeditor/dragtool.cpp
View File

@@ -379,7 +379,7 @@ void DragTool::dragMoveEvent(QGraphicsSceneDragDropEvent * event)
createQmlItemNode(itemLibraryEntry, parentNode, event->scenePos()); createQmlItemNode(itemLibraryEntry, parentNode, event->scenePos());
} else if (event->mimeData()->hasFormat("application/vnd.bauhaus.libraryresource")) { } else if (event->mimeData()->hasFormat("application/vnd.bauhaus.libraryresource")) {
Q_ASSERT(!event->mimeData()->data("application/vnd.bauhaus.libraryresource").isEmpty()); Q_ASSERT(!event->mimeData()->data("application/vnd.bauhaus.libraryresource").isEmpty());
QString imageName = QString::fromLatin1((event->mimeData()->data("application/vnd.bauhaus.libraryresource"))); QString imageName = QString::fromUtf8((event->mimeData()->data("application/vnd.bauhaus.libraryresource")));
createQmlItemNodeFromImage(imageName, parentNode, event->scenePos()); createQmlItemNodeFromImage(imageName, parentNode, event->scenePos());
} else Q_ASSERT(false); } else Q_ASSERT(false);
m_blockMove = true; m_blockMove = true;

2
src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp
View File

@@ -129,7 +129,7 @@ void ItemLibraryTreeView::startDrag(Qt::DropActions /* supportedActions */)
drag->setPreview(pixmap); drag->setPreview(pixmap);
drag->setPixmap(QIcon(pixmap).pixmap(128, 128)); drag->setPixmap(QIcon(pixmap).pixmap(128, 128));
QMimeData *mimeData = new QMimeData; QMimeData *mimeData = new QMimeData;
mimeData->setData("application/vnd.bauhaus.libraryresource", fileInfo.absoluteFilePath().toLatin1()); mimeData->setData("application/vnd.bauhaus.libraryresource", fileInfo.absoluteFilePath().toUtf8());
drag->setMimeData(mimeData); drag->setMimeData(mimeData);
drag->exec(); drag->exec();
} }