2010-04-21 Shu Chang <chang.shu@nokia.com>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Apr 2010 13:08:13 +0000 (13:08 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Apr 2010 13:08:13 +0000 (13:08 +0000)
        Reviewed by Simon Hausmann.

        [Qt] Fix Symbian build where QT_NO_SYSTEMTRAYICON is defined.
        https://bugs.webkit.org/show_bug.cgi?id=37442

        * WebCoreSupport/NotificationPresenterClientQt.cpp:
        (NotificationPresenterClientQt::show):
        * WebCoreSupport/NotificationPresenterClientQt.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@57972 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/qt/ChangeLog
WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.cpp
WebKit/qt/WebCoreSupport/NotificationPresenterClientQt.h

index be7071f..6e73742 100644 (file)
@@ -1,3 +1,14 @@
+2010-04-21  Shu Chang  <chang.shu@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix Symbian build where QT_NO_SYSTEMTRAYICON is defined.
+        https://bugs.webkit.org/show_bug.cgi?id=37442
+
+        * WebCoreSupport/NotificationPresenterClientQt.cpp:
+        (NotificationPresenterClientQt::show):
+        * WebCoreSupport/NotificationPresenterClientQt.h:
+
 2010-04-21  Eric Seidel  <eric@webkit.org>
 
         Unreviewed, rolling out r57963.
index 2687c33..e440837 100644 (file)
@@ -67,10 +67,11 @@ bool NotificationPresenterClientQt::show(Notification* notification)
                 QString(notification->contents().body()).toUtf8().constData());
         }
     }
-            
+
+#ifndef QT_NO_SYSTEMTRAYICON
     m_tray.show();
     m_tray.showMessage(notification->contents().title(), notification->contents().body(), QSystemTrayIcon::Information);
-
+#endif
     return true;
 }
 
index c31ba57..272c661 100644 (file)
@@ -52,7 +52,9 @@ public:
     virtual NotificationPresenter::Permission checkPermission(const KURL&);
 
 private: 
+#ifndef QT_NO_SYSTEMTRAYICON
     QSystemTrayIcon m_tray;
+#endif
 };
 }