Merge topic 'qt5-qtdialog-port'

92b6d85 Enable deprecated API when using Qt 5.
2012-09-25 15:18:14 -04:00 · 2012-09-25 15:18:14 -04:00 · 5549334a99
parent 7d03885d21 92b6d85519
commit 5549334a99
1 changed files with 2 additions and 0 deletions
--- 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)