[Kde-bindings] playground/bindings/phpqt

[Thomas Moenicke]

SVN commit 680346 by moenicke:

* removed copy of smoke/kalyptus, PHP-Qt now uses their originals
* uncommented virtual method eventFilter in calculator example

CCMAIL: kde-bindings at kde.org



 M  +1 -3      CMakeLists.txt  
 A             README.SVN  
 M  +10 -9     cmake/modules/FindQt4.cmake  
 A             cmake/modules/FindQwt5.cmake  
 A             cmake/modules/MacroPushRequiredVars.cmake  
 M  +2 -2      examples/calculator/calculator.php  
 D             kalyptus (directory)  
 AM            prepare_svn.sh  
 D             smoke (directory)  


--- trunk/playground/bindings/phpqt/CMakeLists.txt #680345:680346
@@ -5,7 +5,6 @@
 set(kdebindings_SOURCE_DIR ${PHP-Qt_SOURCE_DIR})
 
 
-
 find_package(Perl REQUIRED)	# for kalyptus
 find_package(Qt4 REQUIRED)	# for kalyptus
 
@@ -15,8 +14,7 @@
     MESSAGE(FATAL_ERROR "PHP5 could not be found!")
 ENDIF(NOT PHP5_FOUND)
 
+OPTION(ENABLE_SMOKEKDE "build SmokeKDE" OFF)
 add_subdirectory(smoke)
 add_subdirectory(php_qt)
 
-
-
--- trunk/playground/bindings/phpqt/cmake/modules/FindQt4.cmake #680345:680346
@@ -187,6 +187,7 @@
 
 INCLUDE(CheckSymbolExists)
 INCLUDE(MacroAddFileDependencies)
+INCLUDE(MacroPushRequiredVars)
 
 SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
 
@@ -386,15 +387,19 @@
   # Find out what window system we're using
   #
   #############################################
-  # Save required includes variable
-  SET(CMAKE_REQUIRED_INCLUDES_SAVE ${CMAKE_REQUIRED_INCLUDES})
+  # Save required includes and required_flags variables
+  macro_push_required_vars()
   # Add QT_INCLUDE_DIR to CMAKE_REQUIRED_INCLUDES
   SET(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${QT_INCLUDE_DIR}")
+  # On Mac OS X when Qt has framework support, also add the framework path
+  IF( QT_USE_FRAMEWORKS )
+    SET(CMAKE_REQUIRED_FLAGS "-F${QT_LIBRARY_DIR} ")
+  ENDIF( QT_USE_FRAMEWORKS )
   # Check for Window system symbols (note: only one should end up being set)
   CHECK_SYMBOL_EXISTS(Q_WS_X11 "QtCore/qglobal.h" Q_WS_X11)
-  CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
   CHECK_SYMBOL_EXISTS(Q_WS_WIN "QtCore/qglobal.h" Q_WS_WIN)
   CHECK_SYMBOL_EXISTS(Q_WS_QWS "QtCore/qglobal.h" Q_WS_QWS)
+  CHECK_SYMBOL_EXISTS(Q_WS_MAC "QtCore/qglobal.h" Q_WS_MAC)
 
   IF (QT_QTCOPY_REQUIRED)
      CHECK_SYMBOL_EXISTS(QT_IS_QTCOPY "QtCore/qglobal.h" QT_KDE_QT_COPY)
@@ -403,8 +408,8 @@
      ENDIF (NOT QT_IS_QTCOPY)
   ENDIF (QT_QTCOPY_REQUIRED)
 
-  # Restore CMAKE_REQUIRED_INCLUDES variable
-  SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_SAVE})
+  # Restore CMAKE_REQUIRED_INCLUDES+CMAKE_REQUIRED_FLAGS variables
+  macro_pop_required_vars()
   #
   #############################################
 
@@ -798,10 +803,6 @@
     _QT4_ADJUST_LIB_VARS(QTMAIN)
   ENDIF(WIN32)
 
-  IF(QT_QTSCRIPT_LIBRARY AND QT_QTUITOOLS_LIBRARY)
-    SET(QT_QTUITOOLS_LIBRARY ${QT_QTUITOOLS_LIBRARY} ${QT_QTSCRIPT_LIBRARY} )
-  ENDIF(QT_QTSCRIPT_LIBRARY AND QT_QTUITOOLS_LIBRARY)
-
   #######################################
   #
   #       Check the executables of Qt 
--- trunk/playground/bindings/phpqt/examples/calculator/calculator.php #680345:680346
@@ -149,7 +149,7 @@
 
         }
 
-/*        function eventFilter($target, $event){
+        function eventFilter($target, $event){
             if ($target == $display) {
                 if ($event->type() == QEvent::MouseButtonPress
                     || $event->type() == QEvent::MouseButtonDblClick
@@ -171,7 +171,7 @@
                 }
             }
             return parent::eventFilter($target, $event);
-        }*/
+        }
 
         function digitClicked()
         {
** trunk/playground/bindings/phpqt/prepare_svn.sh #property svn:executable
   + *