From 16b98d47d0798584f5dd350f488ce7cd54b813ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20M=C3=B6ller?= Date: Fri, 19 Jul 2013 10:58:31 +0000 Subject: [PATCH] - adding qt5 pluginsystem - adding qt5 headers refs #1359 git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@17080 383ad7c9-94d9-4d36-a494-682f7c89f535 --- FileOFF.cc | 13 +++++++++++-- FileOFF.hh | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/FileOFF.cc b/FileOFF.cc index b0012d5..f9f947c 100644 --- a/FileOFF.cc +++ b/FileOFF.cc @@ -40,7 +40,13 @@ * * \*===========================================================================*/ -#include + +#if QT_VERSION >= 0x050000 + #include +#else + #include +#endif + #include #include #include @@ -1451,5 +1457,8 @@ void FileOFFPlugin::slotSaveDefault() { OpenFlipperSettings().setValue( "FileOff/Save/TexCoords", saveTexCoords_->isChecked() ); } -Q_EXPORT_PLUGIN2( fileoffplugin , FileOFFPlugin ); +#if QT_VERSION < 0x050000 + Q_EXPORT_PLUGIN2( fileoffplugin , FileOFFPlugin ); +#endif + diff --git a/FileOFF.hh b/FileOFF.hh index 3b3c38a..8c0c70c 100644 --- a/FileOFF.hh +++ b/FileOFF.hh @@ -73,7 +73,9 @@ class FileOFFPlugin : public QObject, BaseInterface, FileInterface, LoadSaveInte Q_INTERFACES(BaseInterface) Q_INTERFACES(ScriptInterface) Q_INTERFACES(StatusbarInterface) - +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-FileOFF") +#endif signals: void openedFile( int _id ); void addEmptyObject( DataType _type, int& _id); -- GitLab