Merge topic 'fix-FindQt4-available-modules'

d57c1c1 FindQt4: Re-add QAxServer to the QT_MODULES.
This commit is contained in:
Brad King 2013-07-25 08:37:01 -04:00 committed by CMake Topic Stage
commit 86f2d83de3
1 changed files with 1 additions and 1 deletions

View File

@ -886,7 +886,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