)
FIND_PROGRAM(QT_LUPDATE_EXECUTABLE
- NAMES lupdate
+ NAMES lupdate-qt4 lupdate
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH
)
FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
- NAMES lrelease
+ NAMES lrelease-qt4 lrelease
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH
)
ENDMACRO(QT4_GET_MOC_INC_DIRS)
-
MACRO (QT4_GENERATE_MOC infile outfile )
# get include dirs
- QT4_GET_MOC_INC_DIRS(moc_includes)
+ # QT4_GET_MOC_INC_DIRS(moc_includes) # Not needed...
+ # QT4_GET_MOC_DEFINES(moc_defines) # Now supplied via ${MOC_DEFINES}
GET_FILENAME_COMPONENT(abs_infile ${infile} ABSOLUTE)
ELSE (MSVC_IDE)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE}
- ARGS ${moc_includes} -o ${outfile} ${abs_infile}
+ ARGS ${moc_includes} ${MOC_DEFINES} -o ${outfile} ${abs_infile}
DEPENDS ${abs_infile})
ENDIF (MSVC_IDE)
MACRO (QT4_WRAP_CPP outfiles )
# get include dirs
- QT4_GET_MOC_INC_DIRS(moc_includes)
+ # QT4_GET_MOC_INC_DIRS(moc_includes) # Not needed
+ # QT4_GET_MOC_DEFINES(moc_defines) # Now supplied via ${MOC_DEFINES}
QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
FOREACH (it ${moc_files})
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE}
- ARGS ${moc_includes} ${moc_options} -o ${outfile} ${it}
+ ARGS ${moc_includes} ${MOC_DEFINES} ${moc_options} -o ${outfile} ${it}
DEPENDS ${it})
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH(it)
ENDMACRO(QT4_ADD_DBUS_ADAPTOR)
MACRO(QT4_AUTOMOC)
- QT4_GET_MOC_INC_DIRS(_moc_INCS)
+ # QT4_GET_MOC_INC_DIRS(_moc_INCS)
+ QT4_GET_MOC_DEFINES(_moc_DEFINES)
+
SET(_matching_FILES )
FOREACH (_current_FILE ${ARGN})
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_current_MOC})
ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
COMMAND ${QT_MOC_EXECUTABLE}
- ARGS ${_moc_INCS} ${_header} -o ${_moc}
+ ARGS ${_moc_INCS} ${_moc_DEFINES} ${_header} -o ${_moc}
DEPENDS ${_header}
)
# Trolltech said they'd consider exporting it for all platforms in future releases.
SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED)
ENDIF(NOT QT_CONFIG MATCHES "static")
+
+ # OpenSSL
+ IF(NOT QT_QCONFIG MATCHES "openssl")
+ SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_NO_OPENSSL)
+ ENDIF(NOT QT_QCONFIG MATCHES "openssl")
## system png
IF(QT_QCONFIG MATCHES "system-png")