1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QFileDialog: compile with QT_NO_URL_CAST_FROM_STRING.

Browse Source 
This is useful to detect confusions between local paths and URLs.

Change-Id: I1aa72ae10186984812691c8a1a4e843db3c85246
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
David Faure 2014-07-09 11:53:08 +02:00
parent e7b4aaadfa
commit 745448d3ea
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/dialogs/qfiledialog.cpp
View File

@ -39,6 +39,8 @@
** **
****************************************************************************/ ****************************************************************************/
#define QT_NO_URL_CAST_FROM_STRING
#include <qvariant.h> #include <qvariant.h>
#include <private/qwidgetitemdata_p.h> #include <private/qwidgetitemdata_p.h>
#include "qfiledialog.h" #include "qfiledialog.h"

2
src/widgets/dialogs/qfiledialog_p.h
View File

@ -369,7 +369,7 @@ inline QUrl QFileDialogPrivate::directory_sys() const
{ {
if (QPlatformFileDialogHelper *helper = platformFileDialogHelper()) if (QPlatformFileDialogHelper *helper = platformFileDialogHelper())
return helper->directory(); return helper->directory();
return QString(); return QUrl();
} }
inline void QFileDialogPrivate::selectFile_sys(const QUrl &filename) inline void QFileDialogPrivate::selectFile_sys(const QUrl &filename)