Adding version check (#11795)
* Adding version check * Add compat component for Qt6 * Remove too many qts * Fix include path --------- Co-authored-by: David Lanzendörfer <leviathan@libresilicon.com>
This commit is contained in:
committed by
GitHub
parent
e1b69d6f18
commit
55cddc51c0
@@ -82,8 +82,9 @@ bool MaterialConfigLoader::readFile(const QString& path, QMap<QString, QString>&
|
||||
QFile infile(path);
|
||||
if (infile.open(QIODevice::ReadOnly)) {
|
||||
QTextStream in(&infile);
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
|
||||
in.setCodec("UTF-8");
|
||||
|
||||
#endif
|
||||
QString line;
|
||||
QString prefix;
|
||||
while (!in.atEnd()) {
|
||||
@@ -1083,4 +1084,4 @@ MaterialConfigLoader::getMaterialFromPath(const std::shared_ptr<MaterialLibrary>
|
||||
addRenderWB(fcmat, finalModel);
|
||||
|
||||
return finalModel;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user