diff --git a/modules/tde_uic.cmake b/modules/tde_uic.cmake index a00b54f..7b4f50e 100644 --- a/modules/tde_uic.cmake +++ b/modules/tde_uic.cmake @@ -47,10 +47,8 @@ if( _ui_h_content ) string( REGEX REPLACE "#ifndef " "#ifndef UI_" _ui_h_content "${_ui_h_content}" ) string( REGEX REPLACE "#define " "#define UI_" _ui_h_content "${_ui_h_content}" ) if ( TDE_FOUND AND NOT TQT_ONLY ) - string( REGEX REPLACE "public TQWizard" "public KWizard" _ui_h_content "${_ui_h_content}" ) - string( REGEX REPLACE "public QWizard" "public KWizard" _ui_h_content "${_ui_h_content}" ) - string( REGEX REPLACE "#include " "#include " _ui_h_content "${_ui_h_content}" ) - string( REGEX REPLACE "#include " "#include " _ui_h_content "${_ui_h_content}" ) + string( REGEX REPLACE "public T?QWizard" "public KWizard" _ui_h_content "${_ui_h_content}" ) + string( REGEX REPLACE "#include <(n?t)?qwizard.h>" "#include " _ui_h_content "${_ui_h_content}" ) endif( TDE_FOUND AND NOT TQT_ONLY ) file( WRITE ${_ui_basename}.h "${_ui_h_content}" ) endif( ) @@ -67,8 +65,7 @@ if( _ui_cpp_content ) string( REGEX REPLACE "${TR_FUNC}\\(\"\"\\)" "TQString::null" _ui_cpp_content "${_ui_cpp_content}" ) string( REGEX REPLACE "${TR_FUNC}\\(\"\", \"\"\\)" "TQString::null" _ui_cpp_content "${_ui_cpp_content}" ) if ( TDE_FOUND AND NOT TQT_ONLY ) - string( REGEX REPLACE ": TQWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" ) - string( REGEX REPLACE ": QWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" ) + string( REGEX REPLACE ": T?QWizard\\(" ": KWizard(" _ui_cpp_content "${_ui_cpp_content}" ) set( _ui_cpp_content "#include \n#include \n\n${_ui_cpp_content}" ) endif( TDE_FOUND AND NOT TQT_ONLY ) file( WRITE ${_ui_basename}.cpp "${_ui_cpp_content}" )