diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-19 14:54:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-03-19 14:54:18 (GMT) |
| commit | aee06336b86eb2a21c2773cd50470d7fac2dbba6 (patch) | |
| tree | a33b43b0211bda93e096897b6d42f93c1839e288 | |
| parent | 0f4e8fd0e9d4be3d6a9b6fd6d5a89f5155192064 (diff) | |
| parent | 5f210672daff7841bd83023e0d72dfb6b2dacc01 (diff) | |
| download | CMake-aee06336b86eb2a21c2773cd50470d7fac2dbba6.zip CMake-aee06336b86eb2a21c2773cd50470d7fac2dbba6.tar.gz CMake-aee06336b86eb2a21c2773cd50470d7fac2dbba6.tar.bz2 | |
Merge branch 'fix-Qt5-non-Windows' into release
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt index 07a50b9..7885a0c 100644 --- a/Source/QtDialog/CMakeLists.txt +++ b/Source/QtDialog/CMakeLists.txt @@ -28,7 +28,7 @@ if (Qt5Widgets_FOUND) qt5_add_resources(${ARGN}) endmacro() set(CMake_QT_LIBRARIES ${Qt5Widgets_LIBRARIES}) - set(QT_QTMAIN_LIBRARY Qt5::WinMain) + set(QT_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES}) # Remove this when the minimum version of Qt is 4.6. add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) |