[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7279-g34ccdfe

[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  34ccdfe7c30f0cff490c2eb9258a9ce95e1f40f2 (commit)
       via  c38daaf28a23d147ed5f9ea26badd38f5e0348e5 (commit)
      from  78532d6e3eb87c2a479fcae496006a72853f0f27 (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=34ccdfe7c30f0cff490c2eb9258a9ce95e1f40f2
commit 34ccdfe7c30f0cff490c2eb9258a9ce95e1f40f2
Merge: 78532d6 c38daaf
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 26 05:30:00 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jan 26 05:30:00 2014 -0500

    Merge topic 'fix-Qt-autogen' into next
    
    c38daaf2 Replace fwd-declaration.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c38daaf28a23d147ed5f9ea26badd38f5e0348e5
commit c38daaf28a23d147ed5f9ea26badd38f5e0348e5
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Jan 26 11:29:01 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Jan 26 11:29:31 2014 +0100

    Replace fwd-declaration.

diff --git a/Tests/QtAutogen/uiconly.cpp b/Tests/QtAutogen/uiconly.cpp
index 7cbad77..cdb3318 100644
--- a/Tests/QtAutogen/uiconly.cpp
+++ b/Tests/QtAutogen/uiconly.cpp
@@ -1,6 +1,5 @@
 
 #include "uiconly.h"
-#include "ui_uiconly.h"
 
 UicOnly::UicOnly(QWidget *parent)
   : QWidget(parent), ui(new Ui::UicOnly)
diff --git a/Tests/QtAutogen/uiconly.h b/Tests/QtAutogen/uiconly.h
index 0d73a77..9e21f82 100644
--- a/Tests/QtAutogen/uiconly.h
+++ b/Tests/QtAutogen/uiconly.h
@@ -5,10 +5,7 @@
 #include <QWidget>
 #include <memory>
 
-namespace Ui
-{
-class UicOnly;
-}
+#include "ui_uiconly.h"
 
 class UicOnly : public QWidget
 {

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

Summary of changes:
 Tests/QtAutogen/uiconly.cpp |    1 -
 Tests/QtAutogen/uiconly.h   |    5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)


hooks/post-receive
-- 
CMake