summaryrefslogtreecommitdiffstats
path: root/src/gui/util
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-07-07 13:29:05 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-07-07 13:29:05 (GMT)
commit1a112561126c7f2148d91e40a6c3f52ccf506fd5 (patch)
tree7058e2cef4efe7c0ce3c99140fb3050f2e8c22bd /src/gui/util
parente5e2f9fd5c1554337a576374ec6744f953d2404d (diff)
downloadQt-1a112561126c7f2148d91e40a6c3f52ccf506fd5.zip
Qt-1a112561126c7f2148d91e40a6c3f52ccf506fd5.tar.gz
Qt-1a112561126c7f2148d91e40a6c3f52ccf506fd5.tar.bz2
Getting rid of compiler warnings on windows
Diffstat (limited to 'src/gui/util')
-rw-r--r--src/gui/util/qsystemtrayicon_win.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp
index c1b7e7f..dea9264 100644
--- a/src/gui/util/qsystemtrayicon_win.cpp
+++ b/src/gui/util/qsystemtrayicon_win.cpp
@@ -163,7 +163,7 @@ void QSystemTrayIconSys::setIconContents(NOTIFYICONDATA &tnd)
}
}
-int iconFlag( QSystemTrayIcon::MessageIcon icon )
+static int iconFlag( QSystemTrayIcon::MessageIcon icon )
{
#if NOTIFYICON_VERSION >= 3
switch (icon) {
@@ -176,7 +176,7 @@ int iconFlag( QSystemTrayIcon::MessageIcon icon )
case QSystemTrayIcon::NoIcon:
return NIIF_NONE;
default:
- Q_ASSERT("Invalid QSystemTrayIcon::MessageIcon value", false);
+ Q_ASSERT_X(false, "QSystemTrayIconSys::showMessage", "Invalid QSystemTrayIcon::MessageIcon value");
return NIIF_NONE;
}
#else