summaryrefslogtreecommitdiffstats
path: root/Modules/FindQt4.cmake
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-07-24 15:59:13 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-07-24 15:59:13 (GMT)
commitd57c1c1b9ed3d93d2edd1427169c689a813e21b1 (patch)
tree8bc131b18bfc2628960360966059f4d565736d27 /Modules/FindQt4.cmake
parent969e7ee5df77b5856e26633273547700a40f48a2 (diff)
downloadCMake-d57c1c1b9ed3d93d2edd1427169c689a813e21b1.zip
CMake-d57c1c1b9ed3d93d2edd1427169c689a813e21b1.tar.gz
CMake-d57c1c1b9ed3d93d2edd1427169c689a813e21b1.tar.bz2
FindQt4: Re-add QAxServer to the QT_MODULES.
This was removed instead of moved in commit b8af46cb (FindQt4: Don't fail if certain Qt modules are unavailable.).
Diffstat (limited to 'Modules/FindQt4.cmake')
-rw-r--r--Modules/FindQt4.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index d821ff9..6e0f69e 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -881,7 +881,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
endforeach()
if(Q_WS_WIN)
- set(QT_MODULES ${QT_MODULES} QAxContainer)
+ set(QT_MODULES ${QT_MODULES} QAxContainer QAxServer)
# Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
PATHS ${QT_HEADERS_DIR}/ActiveQt