diff options
| author | Brad King <brad.king@kitware.com> | 2013-07-25 12:37:01 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-07-25 12:37:01 (GMT) |
| commit | 86f2d83de3465d4771679770486afead7b5e6027 (patch) | |
| tree | f627bef1554d85a6722d7571ff2d4388b1de8973 /Modules/FindQt4.cmake | |
| parent | 6b92e93b6d39eef8cccc58761cf9738f4195ba9d (diff) | |
| parent | d57c1c1b9ed3d93d2edd1427169c689a813e21b1 (diff) | |
| download | CMake-86f2d83de3465d4771679770486afead7b5e6027.zip CMake-86f2d83de3465d4771679770486afead7b5e6027.tar.gz CMake-86f2d83de3465d4771679770486afead7b5e6027.tar.bz2 | |
Merge topic 'fix-FindQt4-available-modules'
d57c1c1 FindQt4: Re-add QAxServer to the QT_MODULES.
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 7e9caa2..e99abf6 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -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 |