GUI Editor should no longer crash on Linux
This commit is contained in:
parent
ea08136fdc
commit
78691c50da
2 changed files with 15 additions and 4 deletions
|
@ -14,7 +14,6 @@
|
|||
// 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/>.
|
||||
|
||||
|
||||
#include "nel3d_widget.h"
|
||||
#include "nel/3d/u_driver.h"
|
||||
#include "nel/3d/text_context.h"
|
||||
|
@ -29,7 +28,7 @@
|
|||
#include <QResizeEvent>
|
||||
|
||||
Nel3DWidget::Nel3DWidget( QWidget *parent ) :
|
||||
QWidget( parent )
|
||||
NEL3DWIDGET( parent )
|
||||
{
|
||||
driver = NULL;
|
||||
textContext = NULL;
|
||||
|
|
|
@ -18,10 +18,22 @@
|
|||
#ifndef NEL3D_WIDGET_H
|
||||
#define NEL3D_WIDGET_H
|
||||
|
||||
#include <QWidget>
|
||||
#include "nel/misc/types_nl.h"
|
||||
#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"
|
||||
|
||||
namespace NL3D
|
||||
|
@ -31,7 +43,7 @@ namespace NL3D
|
|||
}
|
||||
|
||||
/// Nel 3D interface to Qt
|
||||
class CORE_EXPORT Nel3DWidget : public QWidget
|
||||
class CORE_EXPORT Nel3DWidget : public QGLWidget
|
||||
{
|
||||
Q_OBJECT
|
||||
public:
|
||||
|
|
Loading…
Reference in a new issue