diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-08-26 12:27:31 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-08-26 15:54:02 (GMT) |
| commit | b920f268e8f03e4857485df9dcdbf001409c8c40 (patch) | |
| tree | 6212eacf4a0c07dafae6f93508fd4e1638b8dd44 /src/gui/util | |
| parent | b2835ef710b79e88a1163f653de686a79e810155 (diff) | |
| download | Qt-b920f268e8f03e4857485df9dcdbf001409c8c40.zip Qt-b920f268e8f03e4857485df9dcdbf001409c8c40.tar.gz Qt-b920f268e8f03e4857485df9dcdbf001409c8c40.tar.bz2 | |
reverting the definition of WINVER and _WIN32_WINNT in qglobal.h
This just caused too much problems and must be solved another way.
In qfsfileengine_win.cpp we define FSCTL_GET_REPARSE_POINT and all
of the other stuff that's needed for NTFS symlink support, if
its not defined. This is the case if _WIN32_WINNT is less
than 0x0500.
All other changes in this commit are just reversions of commits
that were done for the infamous qglobal.h change.
Discussed with prasanth, tested by pulse.
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qsystemtrayicon_win.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp index 465c1d8..ea7fbde 100644 --- a/src/gui/util/qsystemtrayicon_win.cpp +++ b/src/gui/util/qsystemtrayicon_win.cpp @@ -132,11 +132,12 @@ QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *object) : hIcon(0), q(object), ignoreNextMouseRelease(false) { - notifyIconSize = sizeof(NOTIFYICONDATA); -#ifdef Q_OS_WINCE - maxTipLength = 64; -#else +#ifndef Q_OS_WINCE + notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, guidItem); // NOTIFYICONDATAW_V2_SIZE; maxTipLength = 128; +#else + notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, szTip[64]); // NOTIFYICONDATAW_V1_SIZE; + maxTipLength = 64; #endif // For restoring the tray icon after explorer crashes |