From d5e3bdc3deb9882a273964c57d6fcfc5dfb9a0ec Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 13 Nov 2011 00:12:07 -0600 Subject: Fix compilation of programs under native TQt3 --- qtinterface/tqt.h.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake index 7f5da92..15c6390 100644 --- a/qtinterface/tqt.h.cmake +++ b/qtinterface/tqt.h.cmake @@ -50,8 +50,6 @@ Boston, MA 02110-1301, USA. #include -#ifndef TQT_REAL_TQT - #ifdef QT_NO_SQL #define TQT_NO_SQL #endif /* QT_NO_SQL */ @@ -62,6 +60,8 @@ Boston, MA 02110-1301, USA. #define TQ_OBJECT /* UNUSED */ +#ifndef TQT_REAL_TQT + #define TQWIDGETSIZE_MAX QWIDGETSIZE_MAX #define TQ_INLINE_TEMPLATES Q_INLINE_TEMPLATES #define TQ_DUMMY_COMPARISON_OPERATOR Q_DUMMY_COMPARISON_OPERATOR @@ -1064,6 +1064,8 @@ Boston, MA 02110-1301, USA. #define TQ_ControlElement ControlElement #define TQ_ComplexControl ComplexControl +#ifndef TQT_REAL_TQT + #define TQUObject QUObject #define static_TQUType_int static_QUType_int #define static_TQUType_TQString static_QUType_QString @@ -1076,6 +1078,8 @@ Boston, MA 02110-1301, USA. #define TQ_EXPORT_PLUGIN Q_EXPORT_PLUGIN #define TQ_EXPORT Q_EXPORT +#endif + #define tqreadBlock readBlock #define tqwriteBlock writeBlock #define TQT_TQIO_LONG TQ_LONG -- cgit v1.2.1