diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/dialogs/qquickabstractfiledialog.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgetsplugin.cpp | 9 |
3 files changed, 12 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index d06443e3..1bc14c0d 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop -MODULE_VERSION = 5.12.2 +MODULE_VERSION = 5.13.0 diff --git a/src/dialogs/qquickabstractfiledialog.cpp b/src/dialogs/qquickabstractfiledialog.cpp index 7c4aa394..c608453f 100644 --- a/src/dialogs/qquickabstractfiledialog.cpp +++ b/src/dialogs/qquickabstractfiledialog.cpp @@ -118,8 +118,10 @@ QUrl QQuickAbstractFileDialog::folder() const static QUrl fixupFolder(const QUrl &f) { QString lf = f.toLocalFile(); +#ifndef Q_OS_WIN // Don't mangle Windows network paths while (lf.startsWith("//")) lf.remove(0, 1); +#endif if (lf.isEmpty()) lf = QDir::currentPath(); return QUrl::fromLocalFile(lf); diff --git a/src/widgets/widgetsplugin.cpp b/src/widgets/widgetsplugin.cpp index 3289e6fd..6617319b 100644 --- a/src/widgets/widgetsplugin.cpp +++ b/src/widgets/widgetsplugin.cpp @@ -39,10 +39,19 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> +#include <QtWidgets/qtwidgetsglobal.h> +#if QT_CONFIG(messagebox) #include "qquickqmessagebox_p.h" +#endif // QT_CONFIG(messagebox) +#if QT_CONFIG(filedialog) #include "qquickqfiledialog_p.h" +#endif // QT_CONFIG(filedialog) +#if QT_CONFIG(colordialog) #include "qquickqcolordialog_p.h" +#endif // QT_CONFIG(colordialog) +#if QT_CONFIG(fontdialog) #include "qquickqfontdialog_p.h" +#endif // QT_CONFIG(fontdialog) QT_BEGIN_NAMESPACE |