diff options
| author | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-07-21 18:27:56 +0200 |
|---|---|---|
| committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-07-22 08:08:05 +0000 |
| commit | 940c7a154ebf42735d51038e71601c0263ac06df (patch) | |
| tree | 1601578f74d8aa03fb4a2b36e64450c0e91d1604 /src/widgets | |
| parent | b67921267c7ab4faea0e21e98573974ef82634aa (diff) | |
| parent | 5c9eb4220fc04730266a58e4e65373eca574e170 (diff) | |
| download | qtquickcontrols-940c7a154ebf42735d51038e71601c0263ac06df.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I689c18ad192a38581d3058e2a555d6438a8d08e2
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/qquickqfiledialog_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/qquickqfiledialog_p.h b/src/widgets/qquickqfiledialog_p.h index 2747749e..7b9e5cbe 100644 --- a/src/widgets/qquickqfiledialog_p.h +++ b/src/widgets/qquickqfiledialog_p.h @@ -64,7 +64,7 @@ public: virtual QList<QUrl> fileUrls() const Q_DECL_OVERRIDE; protected: - QPlatformFileDialogHelper *helper(); + QPlatformFileDialogHelper *helper() Q_DECL_OVERRIDE; Q_DISABLE_COPY(QQuickQFileDialog) }; |