From af87bf4b148c1d583fe9dbbea5e57df6e49e8d7b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 15 Jul 2016 16:58:08 +0200 Subject: [PATCH] Register QStandardPaths enums & flags This allows QML StandardPaths to use the same enums without having to duplicate them. Change-Id: Ibfc63a97a8ba31e5c4dc11e3e8fee9d753087c54 Reviewed-by: Thiago Macieira Reviewed-by: Simon Hausmann --- src/corelib/io/qstandardpaths.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/corelib/io/qstandardpaths.h b/src/corelib/io/qstandardpaths.h index fff1a29bf34..58f228d02b3 100644 --- a/src/corelib/io/qstandardpaths.h +++ b/src/corelib/io/qstandardpaths.h @@ -41,6 +41,7 @@ #define QSTANDARDPATHS_H #include +#include QT_BEGIN_NAMESPACE @@ -49,6 +50,8 @@ QT_BEGIN_NAMESPACE class Q_CORE_EXPORT QStandardPaths { + Q_GADGET + public: // Do not re-order, must match QDesktopServices enum StandardLocation { @@ -73,6 +76,7 @@ public: AppConfigLocation, AppLocalDataLocation = DataLocation }; + Q_ENUM(StandardLocation) static QString writableLocation(StandardLocation type); static QStringList standardLocations(StandardLocation type); @@ -82,6 +86,7 @@ public: LocateDirectory = 0x1 }; Q_DECLARE_FLAGS(LocateOptions, LocateOption) + Q_FLAG(LocateOptions) static QString locate(StandardLocation type, const QString &fileName, LocateOptions options = LocateFile); static QStringList locateAll(StandardLocation type, const QString &fileName, LocateOptions options = LocateFile);