diff --git a/configure.ac b/configure.ac
index 19c6677..8ae968e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,13 @@ dnl ****************************************************************************
GLE_SNAPSHOT=""
dnl ********************************************************************************
+dnl remember CPPFLAGS for qmake
+dnl ********************************************************************************
+
+QT_CPPFLAGS=$CPPFLAGS
+QT_LDFLAGS=$LDFLAGS
+
+dnl ********************************************************************************
dnl check CPU type and OS
dnl ********************************************************************************
@@ -886,6 +893,8 @@ AC_SUBST(MAKE_AUTOPACKAGE)
AC_SUBST(QT_CONFIG)
AC_SUBST(QT_RPATH)
AC_SUBST(QT_LIBGLU_LIB)
+AC_SUBST(QT_CPPFLAGS)
+AC_SUBST(QT_LDFLAGS)
AC_SUBST(HAVE_EXTRA_FONTS)
AC_CONFIG_FILES([Makefile src/gle/Makefile src/gle/bitmap/Makefile src/gle/letzfitz/Makefile src/gle/surface/Makefile src/gle/tokens/Makefile src/fbuild/Makefile src/makefmt/Makefile src/manip/Makefile src/TeX/Makefile src/gui/MakefileAC src/gui/qgle.pro src/doc/gle.1 platform/autoconf/gle-graphics.pc platform/autopackage/gle4.apspec])
diff --git a/src/gle/gle-interface/gle-base.h b/src/gle/gle-interface/gle-base.h
index 26ce8f3..84755e6 100644
--- a/src/gle/gle-interface/gle-base.h
+++ b/src/gle/gle-interface/gle-base.h
@@ -130,7 +130,7 @@ inline GLERefCountObject* GLE_SET_RC(GLERefCountObject* rc, GLERefCountObject* v
template <class T> class GLERCVector : public vector< GLERC<T> > {
public:
- inline void add(T* elem) { push_back(GLERC<T>(elem)); }
+ inline void add(T* elem) { this->push_back(GLERC<T>(elem)); }
inline T* get(int i) { return (*this)[i].get(); }
};
@@ -139,15 +139,15 @@ public:
GLEVectorAutoDelete() : vector<T*>() {
}
~GLEVectorAutoDelete() {
- deleteAll();
+ this->deleteAll();
}
void clear() {
- deleteAll();
+ this->deleteAll();
vector<T*>::clear();
}
void deleteAll() {
for (typename vector<T*>::size_type i = 0; i < vector<T*>::size(); i++) {
- T* elem = at(i);
+ T* elem = this->at(i);
if (elem != NULL) delete elem;
}
}
diff --git a/src/gle/tokens/RefCount.h b/src/gle/tokens/RefCount.h
index eef1824..b9664cc 100644
--- a/src/gle/tokens/RefCount.h
+++ b/src/gle/tokens/RefCount.h
@@ -125,7 +125,8 @@ public:
template <class T> class MutableRefCountPtr : public RefCountPtr<T> {
public:
inline RefCountPtr<T>& operator =(RefCountPtr<T> src) {
- setPtr(src.get()); return *this;
+ this->setPtr(src.get());
+ return *this;
};
};
diff --git a/src/gle/tokens/StringKeyHash.h b/src/gle/tokens/StringKeyHash.h
index 7db46c3..0966676 100644
--- a/src/gle/tokens/StringKeyHash.h
+++ b/src/gle/tokens/StringKeyHash.h
@@ -254,7 +254,7 @@ public:
return i->second;
} else {
ElemType nelem(key);
- insert(StringKeyPair<ElemType>(key, nelem));
+ this->insert(StringKeyPair<ElemType>(key, nelem));
return nelem;
}
}
@@ -309,7 +309,7 @@ public:
}
void add_item(int key, ElemType elem) {
- insert(IntKeyPair<ElemType>(key, elem));
+ this->insert(IntKeyPair<ElemType>(key, elem));
}
};
diff --git a/src/gui/qgle.pro.in b/src/gui/qgle.pro.in
index 877394e..82d274f 100644
--- a/src/gui/qgle.pro.in
+++ b/src/gui/qgle.pro.in
@@ -168,7 +168,7 @@ unix {
LIBS += -lgle-graphics-@GLE_VERSION@ -L../../build/lib/
}
win32 {
- LIBS += -lglu32
+ LIBS += -lglu32
LIBS += -lgle-graphics-@GLE_VERSION@ -L../../build/bin/
}
@@ -180,4 +180,8 @@ unix {
LIBS += @QT_RPATH@ @QT_LIBGLU_LIB@
}
+QMAKE_CXXFLAGS += @QT_CPPFLAGS@
+QMAKE_CFLAGS += @QT_CPPFLAGS@
+QMAKE_LDFLAGS += @QT_LDFLAGS@
+
# vim:et