[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5720-g893210b

[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  893210b2e567ecfa66e7d311c123e4bd1047efd9 (commit)
       via  0e88d54bd16a04cf972a93639150223c0c2a878c (commit)
       via  dd732da34baafb09a97446ddeead28b5c3f001c9 (commit)
       via  ea44cd8ed6b18bce7aa6194d22a1597b22bfae77 (commit)
      from  65ca1fb21260ba4a440b69376245a4a2b74e21f0 (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=893210b2e567ecfa66e7d311c123e4bd1047efd9
commit 893210b2e567ecfa66e7d311c123e4bd1047efd9
Merge: 65ca1fb 0e88d54
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 24 17:03:11 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Nov 24 17:03:11 2013 -0500

    Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next
    
    0e88d54 Try to make the uic command line appear in the dashboard output.
    dd732da Use auto_ptr instead of QScopedPointer.
    ea44cd8 Add error output messages.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0e88d54bd16a04cf972a93639150223c0c2a878c
commit 0e88d54bd16a04cf972a93639150223c0c2a878c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 24 23:02:33 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Nov 24 23:02:33 2013 +0100

    Try to make the uic command line appear in the dashboard output.

diff --git a/Tests/QtAutoUicInterface/CMakeLists.txt b/Tests/QtAutoUicInterface/CMakeLists.txt
index efee77e..555f016 100644
--- a/Tests/QtAutoUicInterface/CMakeLists.txt
+++ b/Tests/QtAutoUicInterface/CMakeLists.txt
@@ -27,6 +27,8 @@ set(CMAKE_AUTOUIC ON)
 
 # BEGIN Upstream
 
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
 add_library(KI18n klocalizedstring.cpp)
 target_link_libraries(KI18n ${QT_CORE_TARGET})
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd732da34baafb09a97446ddeead28b5c3f001c9
commit dd732da34baafb09a97446ddeead28b5c3f001c9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 24 22:59:50 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Nov 24 22:59:50 2013 +0100

    Use auto_ptr instead of QScopedPointer.
    
    Not all Qt installations on the dashboard have QScopedPointer.

diff --git a/Tests/QtAutoUicInterface/libwidget.h b/Tests/QtAutoUicInterface/libwidget.h
index 0b1de10..8b592ec 100644
--- a/Tests/QtAutoUicInterface/libwidget.h
+++ b/Tests/QtAutoUicInterface/libwidget.h
@@ -3,6 +3,7 @@
 #define LIBWIDGET_H
 
 #include <QWidget>
+#include <memory>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
 #include <klocalizedstring.h>
@@ -17,7 +18,7 @@ public:
   explicit LibWidget(QWidget *parent = 0);
 
 private:
-  QScopedPointer<Ui::LibWidget> ui;
+  const std::auto_ptr<Ui::LibWidget> ui;
 };
 
 #endif
diff --git a/Tests/QtAutoUicInterface/mywidget.h b/Tests/QtAutoUicInterface/mywidget.h
index c066318..800c30a 100644
--- a/Tests/QtAutoUicInterface/mywidget.h
+++ b/Tests/QtAutoUicInterface/mywidget.h
@@ -3,6 +3,7 @@
 #define MYWIDGET_H
 
 #include <QWidget>
+#include <memory>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
 #include <klocalizedstring.h>
@@ -17,7 +18,7 @@ public:
   explicit MyWidget(QWidget *parent = 0);
 
 private:
-  QScopedPointer<Ui::MyWidget> ui;
+  std::auto_ptr<Ui::MyWidget> ui;
 };
 
 #endif

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea44cd8ed6b18bce7aa6194d22a1597b22bfae77
commit ea44cd8ed6b18bce7aa6194d22a1597b22bfae77
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Nov 24 22:59:37 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Nov 24 22:59:37 2013 +0100

    Add error output messages.

diff --git a/Tests/QtAutoUicInterface/main.cpp b/Tests/QtAutoUicInterface/main.cpp
index bf11f90..42d5958 100644
--- a/Tests/QtAutoUicInterface/main.cpp
+++ b/Tests/QtAutoUicInterface/main.cpp
@@ -9,6 +9,7 @@ int main(int argc, char **argv)
   f.open(UI_LIBWIDGET_H);
   if (!f.is_open())
     {
+    std::cout << "Could not open \"" UI_LIBWIDGET_H "\"." << std::endl;
     return -1;
     }
 
@@ -41,6 +42,7 @@ int main(int argc, char **argv)
   f.open(UI_MYWIDGET_H);
   if (!f.is_open())
     {
+    std::cout << "Could not open \"" UI_MYWIDGET_H "\"." << std::endl;
     return -1;
     }
 

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

Summary of changes:
 Tests/QtAutoUicInterface/CMakeLists.txt |    2 ++
 Tests/QtAutoUicInterface/libwidget.h    |    3 ++-
 Tests/QtAutoUicInterface/main.cpp       |    2 ++
 Tests/QtAutoUicInterface/mywidget.h     |    3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake