From 7e4444792bccbe269a253ba46307273e4fd71b08 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 27 Jan 2012 15:25:27 +0100
Subject: [PATCH] Resource Editor: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: I83c7e850dc959a58207efb41702a480678f5cfd3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
src/plugins/resourceeditor/resourceeditor.pro | 2 ++
src/shared/qrceditor/qrceditor.cpp | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/plugins/resourceeditor/resourceeditor.pro b/src/plugins/resourceeditor/resourceeditor.pro
index ecb196ad376..9ae137fb29d 100644
--- a/src/plugins/resourceeditor/resourceeditor.pro
+++ b/src/plugins/resourceeditor/resourceeditor.pro
@@ -1,6 +1,8 @@
TEMPLATE = lib
TARGET = ResourceEditor
+DEFINES += QT_NO_CAST_FROM_ASCII
+
include(../../qtcreatorplugin.pri)
include(../../libs/utils/utils.pri)
include(../../plugins/coreplugin/coreplugin.pri)
diff --git a/src/shared/qrceditor/qrceditor.cpp b/src/shared/qrceditor/qrceditor.cpp
index 46028635b9c..f8af0c85b56 100644
--- a/src/shared/qrceditor/qrceditor.cpp
+++ b/src/shared/qrceditor/qrceditor.cpp
@@ -304,7 +304,7 @@ void QrcEditor::resolveLocationIssues(QStringList &files)
if (clickedButton == context.copyButton) {
const QFileInfo fi(file);
QFileInfo suggestion;
- QDir tmpTarget(dir.path() + QString(QDir::separator()) + QString("Resources"));;
+ QDir tmpTarget(dir.path() + QDir::separator() + QLatin1String("Resources"));
if (tmpTarget.exists())
suggestion.setFile(tmpTarget, fi.fileName());
else
--
GitLab