Skip to content

Commit 647e6c4

Browse files
committed
fix goqt_rcc to utf8 encode
1 parent 1abaf74 commit 647e6c4

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

examples/application/application_qrc.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/****************************************************************************
22
** Resource object code
3-
**
4-
** Created: ?? 12? 31 10:03:20 2015
5-
** by: The Resource Compiler for Qt version 4.8.5
3+
4+
** Created by: The Resource Compiler for Qt version 4.8.5
65
**
76
** WARNING! All changes made in this file will be lost!
87
*****************************************************************************/

examples/calculatorbuilder/calculatorbuilder_qrc.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
/****************************************************************************
22
** Resource object code
3-
**
4-
** Created: ?? 12? 31 10:02:46 2015
5-
** by: The Resource Compiler for Qt version 4.8.5
3+
4+
** Created by: The Resource Compiler for Qt version 4.8.5
65
**
76
** WARNING! All changes made in this file will be lost!
87
*****************************************************************************/

tools/rcc/rcc.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib)
175175
lib.writeString("[\n ");
176176
} else {
177177
lib.writeString(" // ");
178-
lib.writeByteArray(resourceName().toLocal8Bit());
178+
lib.writeByteArray(resourceName().toUtf8());
179179
lib.writeString("\n ");
180180
}
181181
}
@@ -246,7 +246,7 @@ qint64 RCCFileInfo::writeDataBlob(RCCResourceLibrary &lib, qint64 offset,
246246
// some info
247247
if (text) {
248248
lib.writeString(" // ");
249-
lib.writeByteArray(m_fileInfo.absoluteFilePath().toLocal8Bit());
249+
lib.writeByteArray(m_fileInfo.absoluteFilePath().toUtf8());
250250
lib.writeString("\n ");
251251
}
252252

@@ -291,7 +291,7 @@ qint64 RCCFileInfo::writeDataName(RCCResourceLibrary &lib, qint64 offset)
291291
// some info
292292
if (text) {
293293
lib.writeString(" // ");
294-
lib.writeByteArray(m_name.toLocal8Bit());
294+
lib.writeByteArray(m_name.toUtf8());
295295
lib.writeString("\n ");
296296
}
297297

@@ -747,16 +747,16 @@ bool RCCResourceLibrary::writeHeader()
747747
} else if (m_format == Go_Code) {
748748
writeString("/****************************************************************************\n");
749749
writeString("** Resource object code\n");
750-
writeString("**\n");
751-
writeString("** Created: ");
752-
writeByteArray(QDateTime::currentDateTime().toString().toUtf8());
753-
writeString("\n** by: The Resource Compiler for Qt version ");
750+
//writeString("**\n");
751+
//writeString("** Created: ");
752+
//writeByteArray(QDateTime::currentDateTime().toString().toUtf8());
753+
writeString("\n** Created by: The Resource Compiler for Qt version ");
754754
writeByteArray(QT_VERSION_STR);
755755
writeString("\n**\n");
756756
writeString("** WARNING! All changes made in this file will be lost!\n");
757757
writeString( "*****************************************************************************/\n\n");
758758
writeString("package ");
759-
writeByteArray(m_goPkg.toLatin1());
759+
writeByteArray(m_goPkg.toUtf8());
760760
writeString("\n\n");
761761
writeString("import \"github.com/visualfc/goqt/ui\"\n\n");
762762
} else if (m_format == Binary) {

0 commit comments

Comments
 (0)