Commit f64efa71 authored by Antoine Regimbeau's avatar Antoine Regimbeau

REFAC: OTB_USE_QT4 => OTB_USE_QT ; HAVE_QT4 => HAVE_QT

parent 91621226
......@@ -167,9 +167,9 @@ check_cmake_variables()
cleanup_package()
set(HAVE_QT4 FALSE CACHE INTERNAL "HAVE_QT4")
set(HAVE_QT FALSE CACHE INTERNAL "HAVE_QT")
if(EXISTS "${SUPERBUILD_INSTALL_DIR}/bin/otbApplicationLauncherQt${EXE_EXT}")
set(HAVE_QT4 TRUE)
set(HAVE_QT TRUE)
endif()
set(HAVE_MVD FALSE CACHE INTERNAL "HAVE_MVD")
......
......@@ -40,8 +40,8 @@ function(install_otbapp_wrapper_scripts otbapp_libfile)
DESTINATION ${PKG_STAGE_DIR}/bin
)
#Do the same for otbgui script but only if HAVE_QT4 is set.
if(NOT HAVE_QT4)
#Do the same for otbgui script but only if HAVE_QT is set.
if(NOT HAVE_QT)
return()
endif()
......
......@@ -18,7 +18,7 @@
# limitations under the License.
#
function(install_qtdev_files)
if(NOT HAVE_QT4)
if(NOT HAVE_QT)
return()
endif()
set(QT_REQ_DIRS)
......
......@@ -54,7 +54,7 @@ function(prepare_file_list file_list_result)
endforeach()
#Qt stuff
if(HAVE_QT4)
if(HAVE_QT)
list(APPEND file_list "lrelease${EXE_EXT}")
list(APPEND file_list "moc${EXE_EXT}")
list(APPEND file_list "qmake${EXE_EXT}")
......
......@@ -73,7 +73,7 @@ OTB_USE_OPENCV:BOOL=ON
OTB_USE_LIBSVM:BOOL=ON
OTB_USE_MUPARSER:BOOL=ON
OTB_USE_MUPARSERX:BOOL=ON
OTB_USE_QT4:BOOL=ON
OTB_USE_QT:BOOL=ON
OTB_USE_OPENGL:BOOL=ON
OTB_USE_GLEW:BOOL=ON
CMAKE_C_FLAGS:STRING=-Wextra
......
......@@ -4067,8 +4067,8 @@ Voulez-vous sauvegarder avant de quitter ?</translation>
<translation>Afficher les raccourcis clavier et souris</translation>
</message>
<message>
<source>Enable OTB_USE_QT4 preprocessor definition at compile time!</source>
<translation type="obsolete">Activer la définition de pré-processeur OTB_USE_QT4 lors de la compilation !</translation>
<source>Enable OTB_USE_QT preprocessor definition at compile time!</source>
<translation type="obsolete">Activer la définition de pré-processeur OTB_USE_QT lors de la compilation !</translation>
</message>
<message>
<source>Layer stack</source>
......@@ -4240,8 +4240,8 @@ Charger &apos;%1&apos; provoquera l&apos;affichage des couches dans une vue non
<translation></translation>
</message>
<message>
<source>Enable OTB_USE_QT4 preprocessor definition at compile time!</source>
<translation>Activer la définition de pré-processeur OTB_USE_QT4 lors de la compilation !</translation>
<source>Enable OTB_USE_QT preprocessor definition at compile time!</source>
<translation>Activer la définition de pré-processeur OTB_USE_QT lors de la compilation !</translation>
</message>
</context>
<context>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment