--- /c/downloads/cmake/CMake/Modules/FindQt4.cmake	Tue Jan 27 12:25:49 2009
+++ /c/Program Files/CMake 2.7/share/cmake-2.7/Modules/FindQt4.cmake	Tue Jan 27 12:30:42 2009
@@ -9,6 +9,7 @@
 # of the following variables to true before doing INCLUDE(${QT_USE_FILE}):
 #                    QT_DONT_USE_QTCORE
 #                    QT_DONT_USE_QTGUI
+#					 QT_USE_ACTIVEQT
 #                    QT_USE_QT3SUPPORT
 #                    QT_USE_QTASSISTANT
 #                    QT_USE_QTDESIGNER
@@ -135,6 +136,7 @@
 #
 #  QT_EDITION               Set to the edition of Qt (i.e. DesktopLight)
 #  QT_EDITION_DESKTOPLIGHT  True if QT_EDITION == DesktopLight
+#  QT_ACTIVEQT_FOUND		True if ActiveQt was found.
 #  QT_QTCORE_FOUND          True if QtCore was found.
 #  QT_QTGUI_FOUND           True if QtGui was found.
 #  QT_QT3SUPPORT_FOUND      True if Qt3Support was found.
@@ -177,6 +179,7 @@
 #  You do not need to use these variables if you include QT_USE_FILE.
 #
 #  QT_INCLUDE_DIR              Path to "include" of Qt4
+#  QT_ACTIVEQT_INCLUDE_DIR	   Path to "include/ActiveQt"
 #  QT_QT3SUPPORT_INCLUDE_DIR   Path to "include/Qt3Support" 
 #  QT_QTASSISTANT_INCLUDE_DIR  Path to "include/QtAssistant" 
 #  QT_QTCORE_INCLUDE_DIR       Path to "include/QtCore"         
@@ -212,6 +215,8 @@
 # You do not need to use these variables if you include QT_USE_FILE,
 # and use QT_LIBRARIES.
 #
+#  QT_ACTIVEQT_AXCONTAINER_LIBRARY  The ActiveQt QAxContainer library
+#  QT_ACTIVEQT_AXSERVER_LIBRARY    	The ActiveQt QAxServer library
 #  QT_QT3SUPPORT_LIBRARY            The Qt3Support library
 #  QT_QTASSISTANT_LIBRARY           The QtAssistant library
 #  QT_QTCORE_LIBRARY                The QtCore library
@@ -501,6 +506,11 @@ IF (QT4_QMAKE_FOUND)
       SET(QT_${_upper_qt_module}_LIBRARY_RELEASE NOTFOUND)
       SET(QT_${_upper_qt_module}_LIBRARY_DEBUG NOTFOUND)
     ENDFOREACH(QT_MODULE)
+	SET(QT_ACTIVEQT_INCLUDE_DIR NOTFOUND)
+	SET(QT_ACTIVEQT_AXCONTAINER_LIBRARY_RELEASE NOTFOUND)
+    SET(QT_ACTIVEQT_AXCONTAINER_LIBRARY_DEBUG NOTFOUND)
+	SET(QT_ACTIVEQT_AXSERVER_LIBRARY_RELEASE NOTFOUND)
+    SET(QT_ACTIVEQT_AXSERVER_LIBRARY_DEBUG NOTFOUND)
     SET(QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR NOTFOUND)
     SET(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NOTFOUND)
     SET(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG NOTFOUND)
@@ -531,7 +541,18 @@ IF (QT4_QMAKE_FOUND)
     ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
     NO_DEFAULT_PATH
     )
-  
+
+  IF(WIN32)
+  # Set QT_ACTIVEQT_INCLUDE_DIR
+  FIND_PATH(QT_ACTIVEQT_AXCONTAINER_INCLUDE_DIR ActiveQt
+    PATHS
+    ${QT_HEADERS_DIR}/ActiveQt
+    NO_DEFAULT_PATH
+    )
+  SET(QT_ACTIVEQT_AXSERVER_INCLUDE_DIR ${QT_ACTIVEQT_AXCONTAINER_INCLUDE_DIR}) # This is a bit of a trick to be able to later use the _QT4_ADJUST_LIB_VARS macro
+  SET(QT_ACTIVEQT_INCLUDE_DIR ${QT_ACTIVEQT_AXCONTAINER_INCLUDE_DIR}) # But _QT4_ADJUST_LIB_VARS won't set the INCLUDE_DIR for us, so we'll do ourselves
+  ENDIF(WIN32)
+
   # Set QT_QTASSISTANT_INCLUDE_DIR
   FIND_PATH(QT_QTASSISTANT_INCLUDE_DIR QAssistantClient
     PATHS
@@ -645,12 +666,24 @@ IF (QT4_QMAKE_FOUND)
   FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES QtDesignerComponents QtDesignerComponents4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)
   FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_DEBUG   NAMES QtDesignerComponents_debug QtDesignerComponentsd QtDesignerComponentsd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
-  # Set QT_QTMAIN_LIBRARY
   IF(WIN32)
+    # Set QT_QTMAIN_LIBRARY
     FIND_LIBRARY(QT_QTMAIN_LIBRARY_RELEASE NAMES qtmain PATHS ${QT_LIBRARY_DIR}
       NO_DEFAULT_PATH)
     FIND_LIBRARY(QT_QTMAIN_LIBRARY_DEBUG NAMES qtmaind PATHS ${QT_LIBRARY_DIR}
       NO_DEFAULT_PATH)
+
+	  # Set QT_ACTIVEQT_AXCONTAINER_LIBRARY
+    FIND_LIBRARY(QT_ACTIVEQT_AXCONTAINER_LIBRARY_RELEASE NAMES qaxcontainer PATHS ${QT_LIBRARY_DIR}
+      NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_ACTIVEQT_AXCONTAINER_LIBRARY_DEBUG NAMES qaxcontainerd PATHS ${QT_LIBRARY_DIR}
+      NO_DEFAULT_PATH)
+	  
+	# Set QT_ACTIVEQT_AXSERVER_LIBRARY
+    FIND_LIBRARY(QT_ACTIVEQT_AXSERVER_LIBRARY_RELEASE NAMES qaxserver PATHS ${QT_LIBRARY_DIR}
+      NO_DEFAULT_PATH)
+    FIND_LIBRARY(QT_ACTIVEQT_AXSERVER_LIBRARY_DEBUG NAMES qaxserverd PATHS ${QT_LIBRARY_DIR}
+      NO_DEFAULT_PATH)
   ENDIF(WIN32)
   
   # Set QT_QTASSISTANTCLIENT_LIBRARY
@@ -756,6 +789,15 @@ IF (QT4_QMAKE_FOUND)
   # platform dependent libraries
   IF(WIN32)
     _QT4_ADJUST_LIB_VARS(QTMAIN)
+	_QT4_ADJUST_LIB_VARS(ACTIVEQT_AXCONTAINER)
+	_QT4_ADJUST_LIB_VARS(ACTIVEQT_AXSERVER)	# TODO-PAU: This does not work because ActiveQt are two libraries: QAxContainer and QAxServer and _QT4_ADJUST_LIB_VARS only works for one library
+	IF(QT_ACTIVEQT_AXCONTAINER_FOUND AND QT_ACTIVEQT_AXSERVER_FOUND)
+		SET(QT_ACTIVEQT_FOUND 1)
+		SET(QT_ACTIVEQT_LIBRARY_RELEASE ${QT_ACTIVEQT_AXCONTAINER_LIBRARY_RELEASE} ${QT_ACTIVEQT_AXSERVER_LIBRARY_RELEASE})
+		SET(QT_ACTIVEQT_LIBRARY_DEBUG ${QT_ACTIVEQT_AXCONTAINER_LIBRARY_DEBUG} ${QT_ACTIVEQT_AXSERVER_LIBRARY_DEBUG})
+		SET(QT_ACTIVEQT_INCLUDE_DIR ${QT_ACTIVEQT_AXCONTAINER_INCLUDE_DIR})
+		_QT4_ADJUST_LIB_VARS(ACTIVEQT)
+	ENDIF(QT_ACTIVEQT_AXCONTAINER_FOUND AND QT_ACTIVEQT_AXSERVER_FOUND)
   ENDIF(WIN32)