summaryrefslogtreecommitdiff
path: root/src/gui/util
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-08-24 15:50:51 +0200
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-08-24 15:52:16 +0200
commit2c21acaee645590f907672b6cfc4d84597444418 (patch)
tree999162b716d2cd3f9f8253fed29181564de1dc5f /src/gui/util
parentabceeb74b02e54be0f4ab741f3ed07dae4c76578 (diff)
downloadqt4-tools-2c21acaee645590f907672b6cfc4d84597444418.tar.gz
Windows compile fix for code that needs WINVER > 0x500
This is premature and is about to change, probably. Reviewed-by: thierry
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qsystemtrayicon_win.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp
index ea7fbde0cd..56872ac57b 100644
--- a/src/gui/util/qsystemtrayicon_win.cpp
+++ b/src/gui/util/qsystemtrayicon_win.cpp
@@ -132,12 +132,15 @@ QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *object)
: hIcon(0), q(object), ignoreNextMouseRelease(false)
{
-#ifndef Q_OS_WINCE
- notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, guidItem); // NOTIFYICONDATAW_V2_SIZE;
- maxTipLength = 128;
-#else
+#ifdef Q_OS_WINCE
notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, szTip[64]); // NOTIFYICONDATAW_V1_SIZE;
maxTipLength = 64;
+#elif WINVER <= 0x0500
+ notifyIconSize = sizeof(NOTIFYICONDATA);
+ maxTipLength = 64;
+#else
+ notifyIconSize = FIELD_OFFSET(NOTIFYICONDATA, guidItem); // NOTIFYICONDATAW_V2_SIZE;
+ maxTipLength = 128;
#endif
// For restoring the tray icon after explorer crashes