forked from qt-creator/qt-creator
QmlDesigner: Fix corner radii for older QtQick
Remove a warning that pops up when the QtQuick version that is used
doesn't contain independent corner radii for Rectangle.
Change-Id: Ideef90d47394bec31fd2ce0ff3f406638c32ac70
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
(cherry picked from commit 80dbdfe032
)
This commit is contained in:
committed by
Thomas Hartmann
parent
08c2c6a1e1
commit
84bdcae35a
@@ -75,4 +75,17 @@ Column {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
<<<<<<< HEAD (08c2c6 QmlDesigner: Fix shape rendering in 2D view)
|
||||||
|
=======
|
||||||
|
|
||||||
|
CornerRadiusSection {
|
||||||
|
id: cornerRadiusSection
|
||||||
|
property bool radiiAvailable: backendValues.topLeftRadius?.isAvailable ?? false
|
||||||
|
// && backendValues.topRightRadius.isAvailable
|
||||||
|
// && backendValues.bottomLeftRadius.isAvailable
|
||||||
|
// && backendValues.bottomRightRadius.isAvailable
|
||||||
|
|
||||||
|
visible: majorQtQuickVersion >= 6 && minorQtQuickVersion >= 7 && cornerRadiusSection.radiiAvailable
|
||||||
|
}
|
||||||
|
>>>>>>> CHANGE (80dbdf QmlDesigner: Fix corner radii for older QtQick)
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user