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

Resource Editor: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I83c7e850dc959a58207efb41702a480678f5cfd3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-27 15:25:27 +01:00
parent 2df4cb21fe
commit 7e4444792b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/resourceeditor/resourceeditor.pro
View File

@@ -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)

2
src/shared/qrceditor/qrceditor.cpp
View File

@@ -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