diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-07-15 16:58:08 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-14 12:41:49 +0000 |
| commit | af87bf4b148c1d583fe9dbbea5e57df6e49e8d7b (patch) | |
| tree | 963fc182429fede6a1d52a109469161e0efb2f3d /src/corelib | |
| parent | dbea5092230ec10bcc1cb4c8e34c8a27c8f0b0e0 (diff) | |
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 <thiago.macieira@intel.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qstandardpaths.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/io/qstandardpaths.h b/src/corelib/io/qstandardpaths.h index fff1a29bf3..58f228d02b 100644 --- a/src/corelib/io/qstandardpaths.h +++ b/src/corelib/io/qstandardpaths.h @@ -41,6 +41,7 @@ #define QSTANDARDPATHS_H #include <QtCore/qstringlist.h> +#include <QtCore/qobjectdefs.h> 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); |