diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-10 08:42:47 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-05-10 08:42:47 (GMT) |
| commit | 42d46a85a50926cd24d7216cb99b4084f6d8ad04 (patch) | |
| tree | 39a79b4709f6da1c04c60a5c3e5adf43c16f6169 /src/gui/dialogs/qfiledialog.h | |
| parent | 37b45fe0415bd6695640b26eb7545280b2e8ffe1 (diff) | |
| parent | a863691765b1788a17a67e826f483b68f0f34066 (diff) | |
| download | Qt-42d46a85a50926cd24d7216cb99b4084f6d8ad04.zip Qt-42d46a85a50926cd24d7216cb99b4084f6d8ad04.tar.gz Qt-42d46a85a50926cd24d7216cb99b4084f6d8ad04.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/dialogs/qfiledialog.h')
| -rw-r--r-- | src/gui/dialogs/qfiledialog.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfiledialog.h b/src/gui/dialogs/qfiledialog.h index 97fac4e..16cb317 100644 --- a/src/gui/dialogs/qfiledialog.h +++ b/src/gui/dialogs/qfiledialog.h @@ -67,6 +67,7 @@ class Q_GUI_EXPORT QFileDialog : public QDialog { Q_OBJECT Q_ENUMS(ViewMode FileMode AcceptMode Option) + Q_FLAGS(Options) Q_PROPERTY(ViewMode viewMode READ viewMode WRITE setViewMode) Q_PROPERTY(FileMode fileMode READ fileMode WRITE setFileMode) Q_PROPERTY(AcceptMode acceptMode READ acceptMode WRITE setAcceptMode) |