diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 21:51:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 21:51:10 (GMT) |
| commit | a32650dc78c925a9b4aed179c80f6e27a67d436b (patch) | |
| tree | 9071b44b04af7c7fdb6930c23c495d8b79e54a94 | |
| parent | f2a96da63ce8b351232ee6891fc0f664f563a8ba (diff) | |
| parent | 161f15e1e79ec5f23244da68340ba1e78f3ac4bb (diff) | |
| download | Qt-a32650dc78c925a9b4aed179c80f6e27a67d436b.zip Qt-a32650dc78c925a9b4aed179c80f6e27a67d436b.tar.gz Qt-a32650dc78c925a9b4aed179c80f6e27a67d436b.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
| -rw-r--r-- | config.tests/unix/icd/icd.cpp | 8 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qcocoaapplicationdelegate_mac.mm | 5 |
3 files changed, 14 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 **) { @@ -5498,8 +5498,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 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 |