From 29d96633a405c2848a70ce5931973be2d518b56f Mon Sep 17 00:00:00 2001 From: Sebastian Holtermann Date: Tue, 21 Feb 2017 11:27:02 +0100 Subject: Autogen: Don't use .moc include in Q_PLUGIN_METADATA test --- Tests/QtAutogen/mocPlugin/StyleD.cpp | 11 ----------- Tests/QtAutogen/mocPlugin/StyleD.hpp | 9 ++++++++- 2 files changed, 8 insertions(+), 12 deletions(-) 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 -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 -- cgit v0.12