diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-19 10:03:47 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-19 10:03:47 +0100 |
| commit | 698a8268f786d74726eb07255df2d26ac2269079 (patch) | |
| tree | 7f63974c3a13b507166e84459be7b5fc2787d2e1 /src/dialogs/qquickabstractfiledialog_p.h | |
| parent | 314d1bdf7d56462102639e12d34596cbfd4fce95 (diff) | |
| parent | eb048e486daa3644476fdec5b0bd016b1729fc01 (diff) | |
| download | qtquickcontrols-698a8268f786d74726eb07255df2d26ac2269079.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/dialogs/qquickabstractfiledialog_p.h
tests/auto/controls/data/tst_combobox.qml
Change-Id: I62e54d0a2e89d987e05e8dfad6ae6aac1a32cc72
Diffstat (limited to 'src/dialogs/qquickabstractfiledialog_p.h')
| -rw-r--r-- | src/dialogs/qquickabstractfiledialog_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/dialogs/qquickabstractfiledialog_p.h b/src/dialogs/qquickabstractfiledialog_p.h index cb7ac27e..e00db5be 100644 --- a/src/dialogs/qquickabstractfiledialog_p.h +++ b/src/dialogs/qquickabstractfiledialog_p.h @@ -75,8 +75,8 @@ class QQuickAbstractFileDialog : public QQuickAbstractDialog Q_PROPERTY(QList<QUrl> fileUrls READ fileUrls NOTIFY selectionAccepted) Q_PROPERTY(bool sidebarVisible READ sidebarVisible WRITE setSidebarVisible NOTIFY sidebarVisibleChanged) Q_PROPERTY(QString defaultSuffix READ defaultSuffix WRITE setDefaultSuffix NOTIFY defaultSuffixChanged) - 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); @@ -118,7 +118,6 @@ Q_SIGNALS: void fileModeChanged(); void selectionAccepted(); void sidebarVisibleChanged(); - void shortcutsChanged(); void defaultSuffixChanged(); protected Q_SLOTS: |