From 57fdbce36e7a5b56cfb4f623c3e939a592e6380e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 15 Feb 2012 13:03:01 -0600 Subject: Fix FTBFS --- qtinterface/tqt.h.cmake | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'qtinterface') diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake index b43bf8d..874c79a 100644 --- a/qtinterface/tqt.h.cmake +++ b/qtinterface/tqt.h.cmake @@ -64,11 +64,11 @@ Boston, MA 02110-1301, USA. #define TQ_WS_X11 #endif /* Q_WS_X11 */ -#define TQ_OBJECT /* UNUSED */ - #ifdef TQT_REAL_TQT #define Qt TQt -#endif +#else /* TQT_REAL_TQT */ +#define TQ_OBJECT /* UNUSED */ +#endif /* TQT_REAL_TQT */ #define TQ_INLINE_TEMPLATES Q_INLINE_TEMPLATES #define TQ_DUMMY_COMPARISON_OPERATOR Q_DUMMY_COMPARISON_OPERATOR @@ -93,6 +93,7 @@ Boston, MA 02110-1301, USA. #define TQTSFUNC QTSFUNC #define TQT_VERSION QT_VERSION +#define TQT_VERSION_STR QT_VERSION_STR #define TQT_BUILD_KEY QT_BUILD_KEY #define TQ_PACKED Q_PACKED #define TQ_INT64_C Q_INT64_C @@ -128,8 +129,6 @@ Boston, MA 02110-1301, USA. #define TQT_CHECK_INVALID_MAP_ELEMENT QT_CHECK_INVALID_MAP_ELEMENT -#define TQT_VERSION QT_VERSION -#define TQT_VERSION_STR QT_VERSION_STR #define TQT_PRODUCT_LICENSEE QT_PRODUCT_LICENSEE #define TQT_TRANSLATE_NOOP QT_TRANSLATE_NOOP -- cgit v1.2.1