summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2012-09-25 19:18:14 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2012-09-25 19:18:14 (GMT)
commit5549334a99024d98e72a445b3d9487732ebd29c7 (patch)
treeda0a935b7bbafddaedfdbb5429c28bb2ac73f8a0
parent7d03885d21f02090f4e8876a349869e59845f035 (diff)
parent92b6d85519a148aa73a4a92468a13bc58f669b3c (diff)
downloadCMake-5549334a99024d98e72a445b3d9487732ebd29c7.zip
CMake-5549334a99024d98e72a445b3d9487732ebd29c7.tar.gz
CMake-5549334a99024d98e72a445b3d9487732ebd29c7.tar.bz2
Merge topic 'qt5-qtdialog-port'
92b6d85 Enable deprecated API when using Qt 5.
-rw-r--r--Source/QtDialog/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index a1ffa20..29daffd 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -25,6 +25,8 @@ if (Qt5Widgets_FOUND)
qt5_add_resources(${ARGN})
endmacro()
set(QT_LIBRARIES ${Qt5Widgets_LIBRARIES})
+ # Remove this when the minimum version of Qt is 4.6.
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0)
else()
set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)