[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2813-g8ca1498

[Alexander Neundorf]

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  8ca149896566119be4d324fd56cbe66d755b8d9e (commit)
       via  eb0d1aee41a81a18823d2c4c436663c595f4e3d8 (commit)
      from  f988603bc6f15b9c9553653135b691343f5647c1 (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=8ca149896566119be4d324fd56cbe66d755b8d9e
commit 8ca149896566119be4d324fd56cbe66d755b8d9e
Merge: f988603 eb0d1ae
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Apr 22 15:51:53 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 22 15:51:53 2013 -0400

    Merge topic 'refs/heads/QtDialogSearchText2' into next
    
    eb0d1ae QtDialog: fix build with Qt 4.4


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eb0d1aee41a81a18823d2c4c436663c595f4e3d8
commit eb0d1aee41a81a18823d2c4c436663c595f4e3d8
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Apr 22 21:51:33 2013 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Apr 22 21:51:33 2013 +0200

    QtDialog: fix build with Qt 4.4
    
    Don't use QStringList::remoevDuplicates(), new in 4.5
    
    Alex

diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 31e89cb..4d62f72 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -1208,8 +1208,10 @@ void CMakeSetupDialog::doOutputFindDialog()
                                          tr("Find:"), strings, 0, true, &ok);
   if (ok && !search.isEmpty())
     {
-    this->FindHistory.push_front(search);
-    this->FindHistory.removeDuplicates();
+    if (!this->FindHistory.contains(search))
+      {
+      this->FindHistory.push_front(search);
+      }
     doOutputFindNext();
     }
 }

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

Summary of changes:
 Source/QtDialog/CMakeSetupDialog.cxx |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake