From 3fddf68f376fe06d0af3f390a94ed84cc1a3fa38 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@nokia.com>
Date: Thu, 7 Oct 2010 12:36:30 +0200
Subject: Ensure that actions are still fired even if there is no visible
 window

On Mac, if there is no visible window then actions can still be fired
from the menubar as the menubar can still be accessed and used.  This
ensures that the actions are still triggered in this circumstance.

Task-number: QTBUG-13941
Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qcocoaapplicationdelegate_mac.mm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 7a9dc70..9b07d64 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -320,5 +320,10 @@ static void cleanupCocoaApplicationDelegate()
     [NSApp terminate:self];
 }
 
+- (void)qtDispatcherToQAction:(id)sender
+{
+    [[NSApp QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader)] qtDispatcherToQAction:sender];
+}
+
 @end
 #endif
-- 
cgit v0.12


From d0f8bfe36e1375ec2628c6bf7fed213cb8d07f1a Mon Sep 17 00:00:00 2001
From: Adrian Constantin <adrian.constantin@nokia.com>
Date: Tue, 5 Oct 2010 21:31:27 +0300
Subject: Fix the icd auto config test after restructuring the icd plugin
 dependencies

* Remove the auto config tests related to libicd-network-wlan-dev
* Add test for the icd backend
* Add test for connsettings

See also f532d8fcd236be9933e4186a95561e1c264de277.

Reviewed-by: Aaron McCarthy
---
 config.tests/unix/icd/icd.cpp | 8 +++++++-
 configure                     | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/config.tests/unix/icd/icd.cpp b/config.tests/unix/icd/icd.cpp
index 19c171b..08ef115 100644
--- a/config.tests/unix/icd/icd.cpp
+++ b/config.tests/unix/icd/icd.cpp
@@ -39,9 +39,15 @@
 **
 ****************************************************************************/
 
-#include <libicd-network-wlan-dev.h>
 #include <wlancond.h>
+
 #include <icd/dbus_api.h>
+#include <icd/network_api_defines.h>
+
+#include <icd/osso-ic.h>
+#include <icd/osso-ic-dbus.h>
+
+#include <conn_settings.h>
 
 int main(int, char **)
 {
diff --git a/configure b/configure
index aca3467..0152c8e 100755
--- a/configure
+++ b/configure
@@ -5485,8 +5485,8 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
     # auto-detect icd support
     if [ "$CFG_GLIB" = "yes" -a "$CFG_ICD" != "no" ]; then
         if [ -n "$PKG_CONFIG" ]; then
-            QT_CFLAGS_CONNSETTINGS=`$PKG_CONFIG --cflags connsettings 2>/dev/null`
-            QT_LIBS_CONNSETTINGS=`$PKG_CONFIG --libs connsettings 2>/dev/null`
+            QT_CFLAGS_CONNSETTINGS=`$PKG_CONFIG --cflags connsettings icd2 2>/dev/null`
+            QT_LIBS_CONNSETTINGS=`$PKG_CONFIG --libs connsettings icd2 2>/dev/null`
         fi
         if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/icd "ICD" $L_FLAGS $I_FLAGS $l_FLAGS $QT_CFLAGS_CONNSETTINGS $QT_LIBS_CONNSETTINGS; then
             [ "$CFG_ICD" = "auto" ] && CFG_ICD=yes
-- 
cgit v0.12