Commit 0ef9224c authored by Matthias Möller's avatar Matthias Möller

- 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
parent bc5dac83
......@@ -41,7 +41,12 @@
\*===========================================================================*/
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QFileInfo>
#include <QSettings>
......@@ -204,6 +209,8 @@ bool FileHeightFieldPNGPlugin::saveObject(int _id, QString _filename) {
return false;
}
#if QT_VERSION < 0x050000
Q_EXPORT_PLUGIN2( fileheightfieldPpngplugin , FileHeightFieldPNGPlugin );
#endif
Q_EXPORT_PLUGIN2( fileheightfieldPpngplugin , FileHeightFieldPNGPlugin );
......@@ -57,6 +57,10 @@ class FileHeightFieldPNGPlugin : public QObject, BaseInterface, FileInterface, L
Q_INTERFACES(LoggingInterface)
Q_INTERFACES(BaseInterface)
#if QT_VERSION >= 0x050000
Q_PLUGIN_METADATA(IID "org.OpenFlipper.Plugins.Plugin-FileHeightFieldImage")
#endif
signals:
void openedFile( int _id );
void addEmptyObject( DataType _type, int& _id);
......
......@@ -41,7 +41,14 @@
\*===========================================================================*/
#include "ui_ImageDialog.hh"
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class ImageDialog : public QDialog, public Ui::ImageDialog
{
......
......@@ -42,7 +42,13 @@
#include "QClickableLabel.hh"
#include <iostream>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
QClickableLabel::QClickableLabel(QWidget *_parent) :
QLabel(_parent)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment