From c90ada79d910428cab049924d393937d3876aeaf Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 12 Jul 2011 12:06:59 +0200 Subject: [PATCH] QmlDesigner.itemLibrary: use utf8 for filenames (not latin1) Task-number: QTCREATORBUG-4617 Change-Id: I6ff20816aa2800d4465a99ee69bdd871e6186a57 Reviewed-on: http://codereview.qt.nokia.com/1511 Reviewed-by: Qt Sanity Bot Reviewed-by: Thomas Hartmann --- src/plugins/qmldesigner/components/formeditor/dragtool.cpp | 2 +- .../components/itemlibrary/itemlibrarycomponents.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp index eb5b7f99c34..f2f95f52cd3 100644 --- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp +++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp @@ -379,7 +379,7 @@ void DragTool::dragMoveEvent(QGraphicsSceneDragDropEvent * event) createQmlItemNode(itemLibraryEntry, parentNode, event->scenePos()); } else if (event->mimeData()->hasFormat("application/vnd.bauhaus.libraryresource")) { 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()); } else Q_ASSERT(false); m_blockMove = true; diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp index 9311e097fdf..77a69272d73 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp @@ -129,7 +129,7 @@ void ItemLibraryTreeView::startDrag(Qt::DropActions /* supportedActions */) drag->setPreview(pixmap); drag->setPixmap(QIcon(pixmap).pixmap(128, 128)); 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->exec(); }