summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitch Curtis <mitch.curtis@qt.io>2018-01-10 16:03:57 (GMT)
committerMitch Curtis <mitch.curtis@qt.io>2018-01-15 08:54:53 (GMT)
commit38414f9262aebe9e77dcb181a1672d2e929fbb48 (patch)
tree0e7d2af683883e2b9cf54f8a9076eb1be5f8138b
parent5f0bd47f81469407023bc9b05b13cdf1834d50b3 (diff)
downloadqtquickcontrols-38414f9262aebe9e77dcb181a1672d2e929fbb48.tar.gz
Fix DefaultFileDialog binding loop warnings
Remove change signals from the shortcuts and __shortcuts properties, as they don't change after being populated for the first time. Task-number: QTBUG-53707 Change-Id: If305a6d63ebd98e6082fc5b7d89a63aaab6c1f43 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
-rw-r--r--src/dialogs/qquickabstractfiledialog.cpp2
-rw-r--r--src/dialogs/qquickabstractfiledialog_p.h5
2 files changed, 2 insertions, 5 deletions
diff --git a/src/dialogs/qquickabstractfiledialog.cpp b/src/dialogs/qquickabstractfiledialog.cpp
index 49d98a1..722838e 100644
--- a/src/dialogs/qquickabstractfiledialog.cpp
+++ b/src/dialogs/qquickabstractfiledialog.cpp
@@ -298,8 +298,6 @@ void QQuickAbstractFileDialog::populateShortcuts()
for (const QFileInfo &fi : drives)
addShortcut(fi.absoluteFilePath(), fi.absoluteFilePath(), fi.absoluteFilePath());
#endif
-
- emit shortcutsChanged();
}
QJSValue QQuickAbstractFileDialog::shortcuts()
diff --git a/src/dialogs/qquickabstractfiledialog_p.h b/src/dialogs/qquickabstractfiledialog_p.h
index b4b7165..84816d3 100644
--- a/src/dialogs/qquickabstractfiledialog_p.h
+++ b/src/dialogs/qquickabstractfiledialog_p.h
@@ -74,8 +74,8 @@ class QQuickAbstractFileDialog : public QQuickAbstractDialog
Q_PROPERTY(QUrl fileUrl READ fileUrl NOTIFY selectionAccepted)
Q_PROPERTY(QList<QUrl> fileUrls READ fileUrls NOTIFY selectionAccepted)
Q_PROPERTY(bool sidebarVisible READ sidebarVisible WRITE setSidebarVisible NOTIFY sidebarVisibleChanged)
- Q_PROPERTY(QJSValue shortcuts READ shortcuts NOTIFY shortcutsChanged) // map of QStandardDirectory names to QUrls
- Q_PROPERTY(QJSValue __shortcuts READ __shortcuts NOTIFY shortcutsChanged) // map of details for QML dialog implementations
+ Q_PROPERTY(QJSValue shortcuts READ shortcuts CONSTANT) // map of QStandardDirectory names to QUrls
+ Q_PROPERTY(QJSValue __shortcuts READ __shortcuts CONSTANT) // map of details for QML dialog implementations
public:
QQuickAbstractFileDialog(QObject *parent = 0);
@@ -115,7 +115,6 @@ Q_SIGNALS:
void fileModeChanged();
void selectionAccepted();
void sidebarVisibleChanged();
- void shortcutsChanged();
protected Q_SLOTS:
void updateFolder(const QUrl &f);