diff options
| -rw-r--r-- | ConfigureChecks.cmake | 6 | ||||
| -rw-r--r-- | qtinterface/tqt.h.cmake | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index a210e98..1947330 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -169,12 +169,12 @@ endif( ) # definitions if( QT_VERSION STREQUAL "3" ) if( HAVE_REAL_TQT ) - set( QT_DEFINITIONS "-DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -DTQT_THREAD_SUPPORT -D_REENTRANT" ) + set( QT_DEFINITIONS "-DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -DTQT_THREAD_SUPPORT -D_REENTRANT" ) else( ) - set( QT_DEFINITIONS "-DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -DQT_THREAD_SUPPORT -D_REENTRANT" ) + set( QT_DEFINITIONS "-DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -DQT_THREAD_SUPPORT -D_REENTRANT" ) endif( ) elseif( QT_VERSION STREQUAL "4" ) - set( QT_DEFINITIONS "-DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -DQT_THREAD_SUPPORT -D_REENTRANT" ) + set( QT_DEFINITIONS "-DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -DQT_THREAD_SUPPORT -D_REENTRANT" ) endif( ) diff --git a/qtinterface/tqt.h.cmake b/qtinterface/tqt.h.cmake index 0c5f71a..69a7acc 100644 --- a/qtinterface/tqt.h.cmake +++ b/qtinterface/tqt.h.cmake @@ -133,7 +133,6 @@ Boston, MA 02110-1301, USA. #endif #define TQT_CHECK_INVALID_MAP_ELEMENT QT_CHECK_INVALID_MAP_ELEMENT -#define TQT_CLEAN_NAMESPACE QT_CLEAN_NAMESPACE #define TQT_PRODUCT_LICENSEE QT_PRODUCT_LICENSEE |