[Cmake-commits] CMake branch, next, updated. v2.8.12-3915-g72966fd

[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  72966fd2471f9cb8a09125816d9de136ff962880 (commit)
       via  98bd143f421ea87a29e7ab245222a954f55d1bfa (commit)
      from  5386743ae44dc756a10ddebcf9d7d8dba79ea5d8 (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=72966fd2471f9cb8a09125816d9de136ff962880
commit 72966fd2471f9cb8a09125816d9de136ff962880
Merge: 5386743 98bd143
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 12 04:20:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 12 04:20:03 2013 -0400

    Merge topic 'Qt-auto-generators' into next
    
    98bd143 Eschew obfuscation assiduously


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98bd143f421ea87a29e7ab245222a954f55d1bfa
commit 98bd143f421ea87a29e7ab245222a954f55d1bfa
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 12 10:18:16 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 12 10:18:16 2013 +0200

    Eschew obfuscation assiduously

diff --git a/Tests/QtAutogen/main.cpp b/Tests/QtAutogen/main.cpp
index 6befc08..c8a036e 100644
--- a/Tests/QtAutogen/main.cpp
+++ b/Tests/QtAutogen/main.cpp
@@ -38,7 +38,7 @@
  **
  ****************************************************************************/
 
-#include <QApplication>
+#include <QCoreApplication>
 #include <QTimer>
 
 #include "codeeditor.h"
@@ -54,11 +54,7 @@
 
 int main(int argv, char **args)
 {
-  QApplication app(argv, args
-#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
-    , QApplication::Tty
-#endif
-    );
+  QCoreApplication app(argv, args);
 
   Foo foo;
   foo.doFoo();

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

Summary of changes:
 Tests/QtAutogen/main.cpp |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake