aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-23 07:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

GUI Editor should no longer crash on Linux

Browse source
This commit is contained in:
dfighter1985 2014-09-20 20:51:08 +02:00
parent 2666f19500
commit a05057bf7e
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.cpp
View file

@ -14,7 +14,6 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "nel3d_widget.h" #include "nel3d_widget.h"
#include "nel/3d/u_driver.h" #include "nel/3d/u_driver.h"
#include "nel/3d/text_context.h" #include "nel/3d/text_context.h"
@ -29,7 +28,7 @@
#include <QResizeEvent> #include <QResizeEvent>
Nel3DWidget::Nel3DWidget( QWidget *parent ) : Nel3DWidget::Nel3DWidget( QWidget *parent ) :
QWidget( parent ) NEL3DWIDGET( parent )
{ {
driver = NULL; driver = NULL;
textContext = NULL; textContext = NULL;

16
code/studio/src/plugins/core/Nel3DWidget/nel3d_widget.h
View file

@ -18,10 +18,22 @@
#ifndef NEL3D_WIDGET_H #ifndef NEL3D_WIDGET_H
#define NEL3D_WIDGET_H #define NEL3D_WIDGET_H
#include <QWidget>
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include <string> #include <string>
#ifdef NEL3DWIDGET
#undef NEL3DWIDGET
#endif
#ifdef NL_OS_WINDOWS
#include <QWidget>
#define NEL3DWIDGET QWidget
#else
#include <QGLWidget>
#define NEL3DWIDGET QGLWidget
#endif
#include "../core_global.h" #include "../core_global.h"
namespace NL3D namespace NL3D
@ -31,7 +43,7 @@ namespace NL3D
} }
/// Nel 3D interface to Qt /// Nel 3D interface to Qt
class CORE_EXPORT Nel3DWidget : public QWidget class CORE_EXPORT Nel3DWidget : public QGLWidget
{ {
Q_OBJECT Q_OBJECT
public: public: