summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-08 16:06:59 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-08 16:06:59 +0900
commite5692c8bdbde55e425a1ec60601680d1114b909d (patch)
tree9908918a3e9a61786fb181ee5784d8c27d8d741d
parentedad8a20b944d45f366acc15b2cd4d291ce3a5dd (diff)
downloadcmake-e5692c8bdbde55e425a1ec60601680d1114b909d.tar.gz
cmake-e5692c8bdbde55e425a1ec60601680d1114b909d.zip
Conversion qt->tqt.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rwxr-xr-xgenerate_apidox2
-rw-r--r--modules/FindTDE.cmake2
-rw-r--r--modules/TDEMacros.cmake2
-rw-r--r--modules/tde_uic.cmake4
4 files changed, 5 insertions, 5 deletions
diff --git a/generate_apidox b/generate_apidox
index 0d809a2..3a4e79c 100755
--- a/generate_apidox
+++ b/generate_apidox
@@ -3,7 +3,7 @@
top_srcdir=${1}
top_builddir=${2}
kde_libs_htmldir=${3}
-export QTDOCDIR=${4}
+export TQTDOCDIR=${4}
if [[ ! -d "${top_srcdir}/doc/common/" ]]; then
export DOXDATA=${kde_libs_htmldir}/en/common
diff --git a/modules/FindTDE.cmake b/modules/FindTDE.cmake
index f91d827..01e6f46 100644
--- a/modules/FindTDE.cmake
+++ b/modules/FindTDE.cmake
@@ -59,7 +59,7 @@ if( NOT TDE_FOUND )
__internal_get_path( config TDE_CONFIG_DIR )
__internal_get_path( html TDE_HTML_DIR )
__internal_get_path( cmake TDE_CMAKE_DIR )
- __internal_get_path( qtplugins TDE_QTPLUGINS_DIR )
+ __internal_get_path( tqtplugins TDE_TQTPLUGINS_DIR )
# find kde tools
macro( __internal_find_program __prog __var )
diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake
index 73739be..729d50f 100644
--- a/modules/TDEMacros.cmake
+++ b/modules/TDEMacros.cmake
@@ -308,7 +308,7 @@ macro( tde_add_ui_files _sources )
COMMAND ${CMAKE_COMMAND}
-DUIC_EXECUTABLE:FILEPATH=${UIC_EXECUTABLE}
-DTQT_REPLACE_SCRIPT:FILEPATH=${TQT_REPLACE_SCRIPT}
- -DTDE_QTPLUGINS_DIR:FILEPATH=${TDE_QTPLUGINS_DIR}
+ -DTDE_TQTPLUGINS_DIR:FILEPATH=${TDE_TQTPLUGINS_DIR}
-DMOC_EXECUTABLE:FILEPATH=${MOC_EXECUTABLE}
-DUI_FILE:FILEPATH=${_ui_absolute_path}
-DMASTER_SOURCE_DIR:FILEPATH=${CMAKE_SOURCE_DIR}
diff --git a/modules/tde_uic.cmake b/modules/tde_uic.cmake
index 7114d20..36b921f 100644
--- a/modules/tde_uic.cmake
+++ b/modules/tde_uic.cmake
@@ -25,8 +25,8 @@ if( EXISTS "${UI_FILE}.h" )
tde_execute_process( COMMAND ${TQT_REPLACE_SCRIPT} ${local_ui_file}.h )
endif( )
-if( TDE_QTPLUGINS_DIR )
- set( L -L ${TDE_QTPLUGINS_DIR} )
+if( TDE_TQTPLUGINS_DIR )
+ set( L -L ${TDE_TQTPLUGINS_DIR} )
endif( )
tde_execute_process( COMMAND ${UIC_EXECUTABLE}