diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-04-29 16:09:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-04-29 17:55:20 +0200 |
| commit | b894a8def5d9107663e4968d2d395f5ef3059125 (patch) | |
| tree | f894c50c9e5cbdd7ec102291eb94979977ce5b37 /src/widgets/dialogs/qfilesystemmodel.h | |
| parent | d2304a28ca657634253af26ad803c7f292e6f4cc (diff) | |
| parent | 002112e80516a29efbb6cef721d74c5fc39fc19d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/features/qml_module.prf
mkspecs/features/qt_common.prf
src/gui/text/qzip.cpp
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/windows/array.h
src/testlib/qtestcase.cpp
src/widgets/dialogs/qfilesystemmodel.h
Change-Id: Ie41c5868415b81f7693c80e045497035504bb210
Diffstat (limited to 'src/widgets/dialogs/qfilesystemmodel.h')
| -rw-r--r-- | src/widgets/dialogs/qfilesystemmodel.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h index b7e77f31db..6d50d0b606 100644 --- a/src/widgets/dialogs/qfilesystemmodel.h +++ b/src/widgets/dialogs/qfilesystemmodel.h @@ -81,6 +81,7 @@ public: QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; QModelIndex index(const QString &path, int column = 0) const; QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; + using QObject::parent; QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; bool canFetchMore(const QModelIndex &parent) const Q_DECL_OVERRIDE; |