[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/utils/charm/trunk/Charm
From:       Mike Arthur <mike () mikearthur ! co ! uk>
Date:       2009-11-04 15:24:53
Message-ID: 1257348293.292178.17614.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1044755 by mikearthur:

Fix Charm compilation with Qt/Cocoa by disabling idle detection.


 M  +2 -2      Application.h  
 M  +2 -2      CMakeLists.txt  
 M  +5 -0      Idle/IdleDetector.cpp  


--- trunk/playground/utils/charm/trunk/Charm/Application.h #1044754:1044755
@@ -13,7 +13,7 @@
 #include <QSystemTrayIcon>
 #include <QMenu>
 #include <QAction>
-#ifdef Q_WS_MAC
+#if defined Q_WS_MAC && !defined QT_MAC_USE_COCOA
 #include "mac_application.h"
 #else
 #include <QApplication>
@@ -37,7 +37,7 @@
 // FIXME read configuration name from command line
 class IdleDetector;
 
-#ifdef Q_WS_MAC
+#if defined Q_WS_MAC && !defined QT_MAC_USE_COCOA
 typedef MacApplication ApplicationBase;
 #else
 typedef QApplication ApplicationBase;
--- trunk/playground/utils/charm/trunk/Charm/CMakeLists.txt #1044754:1044755
@@ -65,7 +65,7 @@
                Idle/X11IdleDetector.cpp
 )
 	set(HAVE_LIBXSS 0)
-	IF( APPLE )
+	IF( APPLE AND NOT QT_MAC_USE_COCOA )
 	   SET( CharmApplication_SRCS 
 		      ${CharmApplication_SRCS} Idle/MacOsIdleDetector.cpp
               mac_application.cpp )
@@ -73,7 +73,7 @@
 	   STRING(REGEX MATCH "^[0-9]+" DARWIN_VERSION ${DARWIN_BUILDVERSION})
 #	   MESSAGE(STATUS "DARWIN_VERSION=${DARWIN_VERSION}")
 	   ADD_DEFINITIONS( -DDARWIN_VERSION=${DARWIN_VERSION} )
-        ELSE( APPLE )
+        ELSE( APPLE AND NOT QT_MAC_USE_COCOA )
 	    IF( UNIX )
                 include(FindX11)
 	        if(X11_FOUND)
--- trunk/playground/utils/charm/trunk/Charm/Idle/IdleDetector.cpp #1044754:1044755
@@ -18,7 +18,12 @@
 IdleDetector* IdleDetector::createIdleDetector( QObject* parent )
 {
 #if defined Q_WS_MAC
+#if defined QT_MAC_USE_COCOA
+    // FIXME port Carbon Idle Detector to Cocoa
+    return 0;
+#else
     return new MacOsIdleDetector( parent );
+#endif
 #elif defined Q_WS_WIN
     // FIXME implement Windows Idle Detector
     // return new ...
[prev in list] [next in list] [prev in thread] [next in thread]