[Cmake-commits] CMake branch, next, updated. v2.8.12-3913-g5386743

Stephen Kelly steveire at gmail.com
Sat Oct 12 03:55:50 EDT 2013


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  5386743ae44dc756a10ddebcf9d7d8dba79ea5d8 (commit)
       via  71960318fe12d00c080a937d5d3c4cc2e281e366 (commit)
      from  3f7f13df3a21b75c3d954c28b4bd8b1a464d8118 (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=5386743ae44dc756a10ddebcf9d7d8dba79ea5d8
commit 5386743ae44dc756a10ddebcf9d7d8dba79ea5d8
Merge: 3f7f13d 7196031
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 12 03:55:47 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 12 03:55:47 2013 -0400

    Merge topic 'Qt-auto-generators' into next
    
    7196031 Try to make the application non-gui.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=71960318fe12d00c080a937d5d3c4cc2e281e366
commit 71960318fe12d00c080a937d5d3c4cc2e281e366
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Oct 12 09:52:02 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Oct 12 09:54:38 2013 +0200

    Try to make the application non-gui.

diff --git a/Tests/QtAutogen/main.cpp b/Tests/QtAutogen/main.cpp
index 060d04b..6befc08 100644
--- a/Tests/QtAutogen/main.cpp
+++ b/Tests/QtAutogen/main.cpp
@@ -54,13 +54,11 @@
 
 int main(int argv, char **args)
 {
-  QApplication app(argv, args);
-
-  CodeEditor editor;
-  editor.setWindowTitle(QObject::tr("Code Editor Example"));
-
-  Window w;
-  w.setWindowTitle(QObject::tr("Window Example"));
+  QApplication app(argv, args
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    , QApplication::Tty
+#endif
+    );
 
   Foo foo;
   foo.doFoo();

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

Summary of changes:
 Tests/QtAutogen/main.cpp |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list