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

QmlDesigner: Suppress some warnings from the assets library

Browse Source 
Change-Id: Idd192ce20e610a1689cfc9b0a11215dd16f09911
Reviewed-by: Samuel Ghinet <samuel.ghinet@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
This commit is contained in:
Mahmoud Badri
2021-06-17 18:22:11 +03:00
parent dc4a8b3866
commit 3188c448b6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/qmldesigner/itemLibraryQmlSources/Assets.qml
View File

@@ -42,7 +42,7 @@ Item {
enabled: true enabled: true
anchors.fill: parent anchors.fill: parent
onEntered: { onEntered: (drag)=> {
files = [] files = []
for (var i = 0; i < drag.urls.length; ++i) { for (var i = 0; i < drag.urls.length; ++i) {
var url = drag.urls[i].toString(); var url = drag.urls[i].toString();
@@ -179,7 +179,7 @@ Item {
onExited: tooltipBackend.hideTooltip() onExited: tooltipBackend.hideTooltip()
onCanceled: tooltipBackend.hideTooltip() onCanceled: tooltipBackend.hideTooltip()
onPositionChanged: tooltipBackend.reposition() onPositionChanged: tooltipBackend.reposition()
onPressed: { onPressed: (mouse)=> {
forceActiveFocus() forceActiveFocus()
if (mouse.button === Qt.LeftButton) { if (mouse.button === Qt.LeftButton) {
var ctrlDown = mouse.modifiers & Qt.ControlModifier var ctrlDown = mouse.modifiers & Qt.ControlModifier
@@ -200,7 +200,7 @@ Item {
} }
} }
onReleased: { onReleased: (mouse)=> {
if (mouse.button === Qt.LeftButton) { if (mouse.button === Qt.LeftButton) {
if (!(mouse.modifiers & Qt.ControlModifier)) if (!(mouse.modifiers & Qt.ControlModifier))
selectedAssets = {} selectedAssets = {}

5
src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetsmodel.cpp
View File

@@ -138,9 +138,8 @@ QVariant ItemLibraryAssetsModel::data(const QModelIndex &index, int role) const
return {}; return {};
} }
if (m_assetsDir && m_roleNames.contains(role)) { if (m_roleNames.contains(role))
return m_assetsDir->property(m_roleNames.value(role)); return m_assetsDir ? m_assetsDir->property(m_roleNames.value(role)) : QVariant();
}
qWarning() << Q_FUNC_INFO << "Invalid role requested: " << QString::number(role); qWarning() << Q_FUNC_INFO << "Invalid role requested: " << QString::number(role);
return {}; return {};