[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-380-g061f28d

[Brad King]

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  061f28d1f29a84f6d5b479e504bad89f63d565f7 (commit)
       via  8a3114147f430b09ccb788de5f60279afb2bfc26 (commit)
      from  7d99813287edba3d73d85f479347a23996bc0ae6 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=061f28d1f29a84f6d5b479e504bad89f63d565f7
commit 061f28d1f29a84f6d5b479e504bad89f63d565f7
Merge: 7d99813 8a31141
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 21 10:12:16 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 21 10:12:16 2017 -0500

    Merge topic 'autogen_json' into next
    
    8a311414 Autogen: Don't use .moc include in Q_PLUGIN_METADATA test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a3114147f430b09ccb788de5f60279afb2bfc26
commit 8a3114147f430b09ccb788de5f60279afb2bfc26
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Tue Feb 21 11:27:02 2017 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 21 10:11:22 2017 -0500

    Autogen: Don't use .moc include in Q_PLUGIN_METADATA test

diff --git a/Tests/QtAutogen/mocPlugin/StyleD.cpp b/Tests/QtAutogen/mocPlugin/StyleD.cpp
index 48398bb..7e4b121 100644
--- a/Tests/QtAutogen/mocPlugin/StyleD.cpp
+++ b/Tests/QtAutogen/mocPlugin/StyleD.cpp
@@ -1,17 +1,6 @@
 #include "StyleD.hpp"
 
-class StyleD : public QStylePlugin
-{
-  Q_OBJECT
-  // Json file in global sub director
-  Q_PLUGIN_METADATA(IID "org.styles.D" FILE "sub/StyleD.json")
-public:
-  QStyle* create(const QString& key);
-};
-
 QStyle* StyleD::create(const QString& key)
 {
   return 0;
 }
-
-#include "StyleD.moc"
diff --git a/Tests/QtAutogen/mocPlugin/StyleD.hpp b/Tests/QtAutogen/mocPlugin/StyleD.hpp
index 2afe055..e58444d 100644
--- a/Tests/QtAutogen/mocPlugin/StyleD.hpp
+++ b/Tests/QtAutogen/mocPlugin/StyleD.hpp
@@ -3,6 +3,13 @@
 
 #include <QStylePlugin>
 
-class StyleD;
+class StyleD : public QStylePlugin
+{
+  Q_OBJECT
+  // Json file in global sub director
+  Q_PLUGIN_METADATA(IID "org.styles.D" FILE "sub/StyleD.json")
+public:
+  QStyle* create(const QString& key);
+};
 
 #endif

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

Summary of changes:
 Tests/QtAutogen/mocPlugin/StyleD.cpp |   11 -----------
 Tests/QtAutogen/mocPlugin/StyleD.hpp |    9 ++++++++-
 2 files changed, 8 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
CMake