Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Georges Editor Qt compilation under Linux

Browse source
This commit is contained in:
kervala 2010-11-02 20:51:39 +01:00
parent ef7ad7daa5
commit 839148e120
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/ryzom/tools/leveldesign/georges_editor_qt/src/callback.h
View file

@ -24,7 +24,13 @@
// STL includes // STL includes
// NeL includes // NeL includes
#include <nel/misc/debug.h> #ifdef NL_COMP_GCC
// temporary fix for GCC 4.4 segmentation fault
# undef nlassert
# define nlassert(x)
#else
# include <nel/misc/debug.h>
#endif // NL_COMP_GCC
// Project includes // Project includes

6
code/ryzom/tools/leveldesign/georges_editor_qt/src/formitem.h
View file

@ -48,12 +48,12 @@ namespace NLQT
int row() const; int row() const;
CFormItem *parent(); CFormItem *parent();
bool setData(int column, const QVariant &value); bool setData(int column, const QVariant &value);
NLGEORGES::UFormElm* getFormElm() {return formElm;}; NLGEORGES::UFormElm* getFormElm() {return formElm;}
NLGEORGES::UFormElm::TWhereIsValue CFormItem::valueFrom() NLGEORGES::UFormElm::TWhereIsValue valueFrom()
{ {
return whereV; return whereV;
} }
NLGEORGES::UFormElm::TWhereIsNode CFormItem::nodeFrom() NLGEORGES::UFormElm::TWhereIsNode nodeFrom()
{ {
return whereN; return whereN;
} }