From f8d69a23bf8f97a0f9b7ab14c9139ec2853f9d88 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 20 Oct 2012 20:03:58 -0500 Subject: Update for latest tqt3 commit --- qtinterface/tqt.h.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake index 514895d..f4f2d09 100644 --- a/qtinterface/tqt.h.cmake +++ b/qtinterface/tqt.h.cmake @@ -75,7 +75,6 @@ Boston, MA 02110-1301, USA. #define TQ_INLINE_TEMPLATES Q_INLINE_TEMPLATES #define TQ_DUMMY_COMPARISON_OPERATOR Q_DUMMY_COMPARISON_OPERATOR -#define TQ_OVERRIDE Q_OVERRIDE #define TQ_REFCOUNT Q_REFCOUNT #define TQ_TYPENAME Q_TYPENAME @@ -85,6 +84,7 @@ Boston, MA 02110-1301, USA. #ifndef TQT_REAL_TQT +#define TQ_OVERRIDE Q_OVERRIDE #define TQWIDGETSIZE_MAX QWIDGETSIZE_MAX #define TQM_EXPORT_SQL QM_EXPORT_SQL @@ -1295,11 +1295,11 @@ Boston, MA 02110-1301, USA. #define tqsizeFromContents sizeFromContents +#ifndef TQT_REAL_TQT + #define TQ_SETS Q_SETS #define TQ_PROPERTY Q_PROPERTY -#ifndef TQT_REAL_TQT - #define TQCOORD QCOORD #define TQCOORD_MAX QCOORD_MAX -- cgit v1.2.1