Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp

Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7

1 files changed, 6 insertions, 2 deletions

diff --git a/src/widgets/util/qsystemtrayicon_mac.mm b/src/widgets/util/qsystemtrayicon_mac.mm
index 59342cb8a4..7f7d7cdc6a 100644
--- a/src/widgets/util/qsystemtrayicon_mac.mm
+++ b/src/widgets/util/qsystemtrayicon_mac.mm
@@ -260,7 +260,11 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &title, const QString
                 notificationIcon = QLatin1String("image from location \"file://") + notificationIconFile.fileName() + QLatin1String("\"");
         }
         const QString script(QLatin1String(
-            "tell application \"GrowlHelperApp\"\n"
+            "tell application \"System Events\"\n"
+            "set isRunning to (count of (every process whose bundle identifier is \"com.Growl.GrowlHelperApp\")) > 0\n"
+            "end tell\n"
+            "if isRunning\n"
+            "tell application id \"com.Growl.GrowlHelperApp\"\n"
             "-- Make a list of all the notification types (all)\n"
             "set the allNotificationsList to {\"") + notificationType + QLatin1String("\"}\n"
 
@@ -276,7 +280,7 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &title, const QString
             QLatin1String("\" description \"") + message +
             QLatin1String("\" application name \"") + notificationApp +
             QLatin1String("\" ")  + notificationIcon +
-            QLatin1String("\nend tell"));
+            QLatin1String("\nend tell\nend if"));
         qt_mac_execute_apple_script(script, 0);
 #elif 0
         Q_Q(QSystemTrayIcon);