From 1e911bc695e2b45108d93b3fbb2c462a7c7ec67a Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Tue, 20 Jan 2015 09:31:37 +0100 Subject: [PATCH] fix qt4 build due to the removal of explicit moc includes the qt4 build broke as the plugin helpers were multi-defined (not that I knew why). easy way out is moving Q_EXPORT_PLUGIN2 from the .h to the .cpp as recommended by the qt docs anyway. > There should be exactly one occurrence of this macro in the source code > for a Qt plugin, and it should be used where the implementation is > written rather than in a header file. http://build.kde.org/job/breeze_master/82/console CCMAIL: kfunk@kde.org --- kstyle/breezestyleplugin.cpp | 4 ++++ kstyle/breezestyleplugin.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kstyle/breezestyleplugin.cpp b/kstyle/breezestyleplugin.cpp index 44710d34..24055491 100644 --- a/kstyle/breezestyleplugin.cpp +++ b/kstyle/breezestyleplugin.cpp @@ -23,6 +23,10 @@ #include +#if QT_VERSION < 0x050000 +Q_EXPORT_PLUGIN2( breeze-qt, Breeze::StylePlugin ) +#endif + namespace Breeze { diff --git a/kstyle/breezestyleplugin.h b/kstyle/breezestyleplugin.h index eadf9b7b..d35d2e0d 100644 --- a/kstyle/breezestyleplugin.h +++ b/kstyle/breezestyleplugin.h @@ -54,8 +54,4 @@ namespace Breeze } -#if QT_VERSION < 0x050000 -Q_EXPORT_PLUGIN2( breeze-qt, Breeze::StylePlugin ) -#endif - #endif