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

QmlDesigner: fix unresolved conflict

Browse Source 
Change-Id: I5b83f91162abf79859cb5b086a93bab6ce30a263
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2025-06-05 07:25:07 +02:00
parent 95931b9847
commit ce74d6857d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/propertyeditor/fileresourcesmodel.cpp
View File

@@ -183,9 +183,6 @@ QVariant FileResourcesModel::modelNodeBackend() const
return QVariant(); return QVariant();
} }
<<<<<<< HEAD (a2c8a1 Core: fix rare crash in GeneralSettingsWidget::apply())
bool filterMetaIcons(const QString &fileName)
=======
static bool checkIgnoreFile(const QString &fileName) static bool checkIgnoreFile(const QString &fileName)
{ {
QFileInfo info(fileName); QFileInfo info(fileName);
@@ -203,7 +200,6 @@ static bool checkIgnoreFile(const QString &fileName)
} }
static bool filterMetaIcons(const QString &fileName) static bool filterMetaIcons(const QString &fileName)
>>>>>>> CHANGE (1a3998 QmlDesigner: Skip Dependencies folder for resources)
{ {
QFileInfo info(fileName); QFileInfo info(fileName);