Update for latest tqt3 commit

12 years ago · f8d69a23bf
parent ecbb9fba82
commit f8d69a23bf
1 changed files with 3 additions and 3 deletions
--- 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