diff options
| author | David Faure <david.faure@kdab.com> | 2014-07-09 11:53:08 +0200 |
|---|---|---|
| committer | David Faure <david.faure@kdab.com> | 2014-07-09 23:46:37 +0200 |
| commit | 745448d3eaa178ff1b7b75bdd577ad31e9177cd6 (patch) | |
| tree | 8b08cc90a3f17425a76aba008ca31b9b44429082 /src/widgets | |
| parent | e7b4aaadfa49b289dd23879f8b1e3d5d1df4caf1 (diff) | |
QFileDialog: compile with QT_NO_URL_CAST_FROM_STRING.
This is useful to detect confusions between local paths and URLs.
Change-Id: I1aa72ae10186984812691c8a1a4e843db3c85246
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/dialogs/qfiledialog_p.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index f0dc577c0f..e3e4a58333 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -39,6 +39,8 @@ ** ****************************************************************************/ +#define QT_NO_URL_CAST_FROM_STRING + #include <qvariant.h> #include <private/qwidgetitemdata_p.h> #include "qfiledialog.h" diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index 632bbca5a4..c20dd36953 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -369,7 +369,7 @@ inline QUrl QFileDialogPrivate::directory_sys() const { if (QPlatformFileDialogHelper *helper = platformFileDialogHelper()) return helper->directory(); - return QString(); + return QUrl(); } inline void QFileDialogPrivate::selectFile_sys(const QUrl &filename) |