Commit 1ddc2ced 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 03a5c3e0
...@@ -50,7 +50,9 @@ ...@@ -50,7 +50,9 @@
#include <QFileInfo> #include <QFileInfo>
#include <QDir> #include <QDir>
#include <QTextStream> #include <QTextStream>
#undef QT_NO_OPENGL
#include <QGLFormat> #include <QGLFormat>
#define QT_NO_OPENGL
namespace ACG namespace ACG
{ {
......
...@@ -58,7 +58,9 @@ ...@@ -58,7 +58,9 @@
#include "../Scenegraph/SceneGraph.hh" #include "../Scenegraph/SceneGraph.hh"
#include "../Scenegraph/DrawModes.hh" #include "../Scenegraph/DrawModes.hh"
#include <QtOpenGL/QGLFormat> #undef QT_NO_OPENGL
#include <QGLFormat>
#define QT_NO_OPENGL
#include <QBoxLayout> #include <QBoxLayout>
#include <QtNetwork/QUdpSocket> #include <QtNetwork/QUdpSocket>
#include <QWheelEvent> #include <QWheelEvent>
......
...@@ -55,7 +55,10 @@ ...@@ -55,7 +55,10 @@
//== INCLUDES ================================================================= //== INCLUDES =================================================================
#undef QT_NO_OPENGL
#include <QGLContext> #include <QGLContext>
#define QT_NO_OPENGL
#include "../Config/ACGDefines.hh" #include "../Config/ACGDefines.hh"
//== NAMESPACES =============================================================== //== NAMESPACES ===============================================================
......
...@@ -65,7 +65,9 @@ ...@@ -65,7 +65,9 @@
#include <QFontMetrics> #include <QFontMetrics>
#include <QImage> #include <QImage>
#include <QPainter> #include <QPainter>
#undef QT_NO_OPENGL
#include <QGLWidget> #include <QGLWidget>
#define QT_NO_OPENGL
//== NAMESPACES =============================================================== //== NAMESPACES ===============================================================
......
...@@ -55,7 +55,9 @@ ...@@ -55,7 +55,9 @@
#include "TextureNode.hh" #include "TextureNode.hh"
#include "DrawModes.hh" #include "DrawModes.hh"
#undef QT_NO_OPENGL
#include <QGLWidget> #include <QGLWidget>
#define QT_NO_OPENGL
//== NAMESPACES =============================================================== //== NAMESPACES ===============================================================
......
...@@ -58,7 +58,9 @@ ...@@ -58,7 +58,9 @@
#include <ACG/Scenegraph/BaseNode.hh> #include <ACG/Scenegraph/BaseNode.hh>
#include <ACG/Scenegraph/DrawModes.hh> #include <ACG/Scenegraph/DrawModes.hh>
#undef QT_NO_OPENGL
#include <QGLWidget> #include <QGLWidget>
#define QT_NO_OPENGL
//== FORWARDDECLARATIONS ====================================================== //== FORWARDDECLARATIONS ======================================================
......
...@@ -58,7 +58,10 @@ ...@@ -58,7 +58,10 @@
#include <ACG/Scenegraph/BaseNode.hh> #include <ACG/Scenegraph/BaseNode.hh>
#include <ACG/Scenegraph/DrawModes.hh> #include <ACG/Scenegraph/DrawModes.hh>
#undef QT_NO_OPENGL
#include <QGLWidget> #include <QGLWidget>
#define QT_NO_OPENGL
#include <QImage> #include <QImage>
//== FORWARDDECLARATIONS ====================================================== //== FORWARDDECLARATIONS ======================================================
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
\*===========================================================================*/ \*===========================================================================*/
#include "LightWidget.hh" #include "LightWidget.hh"
#include <QtGui>
#include <QMessageBox> #include <QMessageBox>
#include <iostream> #include <iostream>
#include <OpenFlipper/common/GlobalOptions.hh> #include <OpenFlipper/common/GlobalOptions.hh>
......
...@@ -41,7 +41,13 @@ ...@@ -41,7 +41,13 @@
\*===========================================================================*/ \*===========================================================================*/
#include <ui_lightWidget.hh> #include <ui_lightWidget.hh>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <ObjectTypes/Light/LightNode.hh> #include <ObjectTypes/Light/LightNode.hh>
#include <OpenFlipper/common/GlobalDefines.hh> #include <OpenFlipper/common/GlobalDefines.hh>
#include "Light.hh" #include "Light.hh"
......
...@@ -48,9 +48,12 @@ ...@@ -48,9 +48,12 @@
#include <ACG/Geometry/Types/PlaneT.hh> #include <ACG/Geometry/Types/PlaneT.hh>
#include <QImage> #include <QImage>
#include <QGLWidget>
#include <QMouseEvent> #include <QMouseEvent>
#include<QApplication> #include <QApplication>
#undef QT_NO_OPENGL
#include <QGLWidget>
#define QT_NO_OPENGL
//== NAMESPACES =============================================================== //== NAMESPACES ===============================================================
......
...@@ -43,7 +43,12 @@ ...@@ -43,7 +43,12 @@
#pragma once #pragma once
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file AboutInfoInterface.hh /** \file AboutInfoInterface.hh
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef BACKUPPLUGININTERFACE_HH #ifndef BACKUPPLUGININTERFACE_HH
#define BACKUPPLUGININTERFACE_HH #define BACKUPPLUGININTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
/** \file BackupInterface.hh /** \file BackupInterface.hh
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef BASEINTERFACE_HH #ifndef BASEINTERFACE_HH
#define BASEINTERFACE_HH #define BASEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#include "WhatsThisGenerator.hh" #include "WhatsThisGenerator.hh"
......
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
#ifndef CONTEXTMENUINTERFACE_HH #ifndef CONTEXTMENUINTERFACE_HH
#define CONTEXTMENUINTERFACE_HH #define CONTEXTMENUINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
#ifndef FILEINTERFACE_HH #ifndef FILEINTERFACE_HH
#define FILEINTERFACE_HH #define FILEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
/** \file FileInterface.hh /** \file FileInterface.hh
......
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
#ifndef INIINTERFACE_HH #ifndef INIINTERFACE_HH
#define INIINTERFACE_HH #define INIINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
#ifndef KEYINTERFACE_HH #ifndef KEYINTERFACE_HH
#define KEYINTERFACE_HH #define KEYINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef MENUBARINTERFACE_HH #ifndef MENUBARINTERFACE_HH
#define MENUBARINTERFACE_HH #define MENUBARINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -44,7 +44,12 @@ ...@@ -44,7 +44,12 @@
#ifndef MOUSEINTERFACE_HH #ifndef MOUSEINTERFACE_HH
#define MOUSEINTERFACE_HH #define MOUSEINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file MouseInterface.hh /** \file MouseInterface.hh
......
...@@ -44,7 +44,12 @@ ...@@ -44,7 +44,12 @@
#ifndef OPTIONSINTERFACE_HH #ifndef OPTIONSINTERFACE_HH
#define OPTIONSINTERFACE_HH #define OPTIONSINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file OptionsInterface.hh /** \file OptionsInterface.hh
......
...@@ -43,7 +43,12 @@ ...@@ -43,7 +43,12 @@
#ifndef PICKINGINTERFACE_HH #ifndef PICKINGINTERFACE_HH
#define PICKINGINTERFACE_HH #define PICKINGINTERFACE_HH
#include <QtGui> #if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef PROCESSINTERFACE_HH #ifndef PROCESSINTERFACE_HH
#define PROCESSINTERFACE_HH #define PROCESSINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/threads/OpenFlipperThread.hh> #include <OpenFlipper/threads/OpenFlipperThread.hh>
/** \file ProcessInterface.hh /** \file ProcessInterface.hh
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef SECURITYINTERFACE_HH #ifndef SECURITYINTERFACE_HH
#define SECURITYINTERFACE_HH #define SECURITYINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -46,7 +46,14 @@ ...@@ -46,7 +46,14 @@
#include <OpenFlipper/INIFile/INIFile.hh> #include <OpenFlipper/INIFile/INIFile.hh>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
/** \file SelectionInterface.hh /** \file SelectionInterface.hh
* *
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef STATUSBARINTERFACE_HH #ifndef STATUSBARINTERFACE_HH
#define STATUSBARINTERFACE_HH #define STATUSBARINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#include <QStatusBar> #include <QStatusBar>
......
...@@ -44,7 +44,13 @@ ...@@ -44,7 +44,13 @@
#ifndef TEXTUREINTERFACE_HH #ifndef TEXTUREINTERFACE_HH
#define TEXTUREINTERFACE_HH #define TEXTUREINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef TOOLBARINTERFACE_HH #ifndef TOOLBARINTERFACE_HH
#define TOOLBARINTERFACE_HH #define TOOLBARINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <QStringList> #include <QStringList>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -43,7 +43,13 @@ ...@@ -43,7 +43,13 @@
#ifndef TOOLBOXINTERFACE_HH #ifndef TOOLBOXINTERFACE_HH
#define TOOLBOXINTERFACE_HH #define TOOLBOXINTERFACE_HH
#include <QtGui>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QMenuBar> #include <QMenuBar>
#include <QStringList> #include <QStringList>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -43,9 +43,15 @@ ...@@ -43,9 +43,15 @@
#ifndef VIEWINTERFACE_HH