diff options
author | axis <qt-info@nokia.com> | 2010-03-15 11:00:38 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2010-03-15 11:00:38 (GMT) |
commit | b65a79f7079106233e32251e9a6ab0639cdad662 (patch) | |
tree | 66eb210b7a611a161cc06bf724f61bc5ac710072 /src/gui/dialogs/qfiledialog_win_p.h | |
parent | fc3f88b5c22c12c8f61da152ca82cb10f18d2902 (diff) | |
parent | 065f26ef3996368ba67ff5d8e34b20106c359a95 (diff) | |
download | Qt-b65a79f7079106233e32251e9a6ab0639cdad662.zip Qt-b65a79f7079106233e32251e9a6ab0639cdad662.tar.gz Qt-b65a79f7079106233e32251e9a6ab0639cdad662.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/gui/dialogs/qfiledialog_win_p.h')
-rw-r--r-- | src/gui/dialogs/qfiledialog_win_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog_win_p.h b/src/gui/dialogs/qfiledialog_win_p.h index 44b7e43..7079925 100644 --- a/src/gui/dialogs/qfiledialog_win_p.h +++ b/src/gui/dialogs/qfiledialog_win_p.h @@ -82,7 +82,7 @@ typedef int GETPROPERTYSTOREFLAGS; #define GPS_BESTEFFORT 0x00000040 #define GPS_MASK_VALID 0x0000007F -typedef int (CALLBACK* BFFCALLBACK)(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData); +typedef int (QT_WIN_CALLBACK* BFFCALLBACK)(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData); // message from browser #define BFFM_INITIALIZED 1 #define BFFM_SELCHANGED 2 |