[Cmake-commits] CMake branch, next, updated. v2.8.9-699-g9280204

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9280204ed6d2cd9bc49d9e9deba91b159f30c8d5 (commit)
       via  92b6d85519a148aa73a4a92468a13bc58f669b3c (commit)
      from  94a77401cb1717b2fc2d96f24d91feeab70c968c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9280204ed6d2cd9bc49d9e9deba91b159f30c8d5
commit 9280204ed6d2cd9bc49d9e9deba91b159f30c8d5
Merge: 94a7740 92b6d85
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 23 14:16:29 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 23 14:16:29 2012 -0400

    Merge topic 'qt5-qtdialog-port' into next
    
    92b6d85 Enable deprecated API when using Qt 5.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=92b6d85519a148aa73a4a92468a13bc58f669b3c
commit 92b6d85519a148aa73a4a92468a13bc58f669b3c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Sep 23 20:13:06 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Sep 23 20:13:06 2012 +0200

    Enable deprecated API when using Qt 5.
    
    The QAbstractItemModel::reset() method is deprecated in Qt 5, and
    therefore not part of the API by default (on non-Windows).
    
    The replacement for it is beginResetModel/endResetModel which are
    available from Qt 4.6 onwards.
    
    The minimum version of Qt required is currently 4.4, so enable the
    deprecated API instead of changing that.

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)

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeLists.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake