forked from qt-creator/qt-creator
Do not use the fromAscii() and toAscii() functions.
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In Qt 5, these always do the same thing as their "Ascii" counterparts. The same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not been set, which it hasn't. Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
@@ -585,10 +585,10 @@ int main(int argc, char *argv[])
|
||||
|
||||
// find all QMetaObjects reachable when the specified module is imported
|
||||
if (action != Path) {
|
||||
importCode += QString("import %0 %1\n").arg(pluginImportUri, pluginImportVersion).toAscii();
|
||||
importCode += QString("import %0 %1\n").arg(pluginImportUri, pluginImportVersion).toLatin1();
|
||||
} else {
|
||||
// pluginImportVersion can be empty
|
||||
importCode += QString("import \".\" %2\n").arg(pluginImportVersion).toAscii();
|
||||
importCode += QString("import \".\" %2\n").arg(pluginImportVersion).toLatin1();
|
||||
}
|
||||
|
||||
// create a component with these imports to make sure the imports are valid
|
||||
|
||||
Reference in New Issue
Block a user