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
e43a3b17c8
commit
7ad74e1a73
@@ -16,6 +16,9 @@ if(BUILD_GUI)
|
||||
endif()
|
||||
endif()
|
||||
list (APPEND FREECAD_QT_COMPONENTS OpenGL PrintSupport Svg UiTools Widgets LinguistTools)
|
||||
if (FREECAD_QT_MAJOR_VERSION EQUAL 6)
|
||||
list (APPEND FREECAD_QT_COMPONENTS Core5Compat)
|
||||
endif()
|
||||
if (BUILD_WEB)
|
||||
list (APPEND FREECAD_QT_COMPONENTS WebEngineWidgets)
|
||||
endif()
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,6 +29,10 @@
|
||||
#include <QList>
|
||||
#include <QMetaType>
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
|
||||
#include <QtCore5Compat/QRegExp>
|
||||
#endif
|
||||
|
||||
#include <App/Application.h>
|
||||
#include <Base/Interpreter.h>
|
||||
#include <Gui/MetaTypes.h>
|
||||
|
||||
Reference in New Issue
Block a user