diff options
| -rw-r--r-- | ConfigureChecks.cmake | 6 | ||||
| -rw-r--r-- | qtinterface/tqt.h.cmake | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 1ce5c9b..d5ff0eb 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -48,7 +48,11 @@ qt_message( " QT_PREFIX_DIR : ${QT_PREFIX_DIR}" ) # qt headers if( NOT DEFINED QT_INCLUDE_DIR ) if( QT_PREFIX_DIR STREQUAL "/usr" ) - set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" ) + if( EXISTS "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" ) + set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" ) + else( ) + set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" ) + endif( ) else( ) set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include" ) endif( ) diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake index 94c0c28..7f5da92 100644 --- a/qtinterface/tqt.h.cmake +++ b/qtinterface/tqt.h.cmake @@ -1044,6 +1044,8 @@ Boston, MA 02110-1301, USA. #define tqsizeFromContents sizeFromContents #define tqdrawComplexControlMask drawComplexControlMask +#ifndef TQT_REAL_TQT + #define TQCOORD QCOORD #define TQCOORD_MAX QCOORD_MAX #define TQ_SETS Q_SETS @@ -1051,6 +1053,9 @@ Boston, MA 02110-1301, USA. #define TQMIN QMIN #define TQMAX QMAX #define TQABS QABS + +#endif + #define tqMakePair qMakePair #define qt_tqfind_obj_child qt_find_obj_child #define tqt_ucm_query_verification_data qt_ucm_query_verification_data |