Merge topic 'fix-Qt-casing'
3252149 Fix casing of 'Qt' in docs, comments and user-visible strings.This commit is contained in:
Brad King
CMake Topic Stage
commit
4f3436dd11
|
|
@ -1,7 +1,7 @@
|
|||
# - Searches for all installed versions of QT.
|
||||
# - Searches for all installed versions of Qt.
|
||||
# This should only be used if your project can work with multiple
|
||||
# versions of QT. If not, you should just directly use FindQt4 or FindQt3.
|
||||
# If multiple versions of QT are found on the machine, then
|
||||
# versions of Qt. If not, you should just directly use FindQt4 or FindQt3.
|
||||
# If multiple versions of Qt are found on the machine, then
|
||||
# The user must set the option DESIRED_QT_VERSION to the version
|
||||
# they want to use. If only one version of qt is found on the machine,
|
||||
# then the DESIRED_QT_VERSION is set to that version and the
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
# is included.
|
||||
#
|
||||
# QT_REQUIRED if this is set to TRUE then if CMake can
|
||||
# not find QT4 or QT3 an error is raised
|
||||
# not find Qt4 or Qt3 an error is raised
|
||||
# and a message is sent to the user.
|
||||
#
|
||||
# DESIRED_QT_VERSION OPTION is created
|
||||
|
|
@ -62,7 +62,7 @@ if(QT_QMAKE_EXECUTABLE_FINDQT)
|
|||
exec_program(${QT_QMAKE_EXECUTABLE_FINDQT} ARGS "-query QT_VERSION"
|
||||
OUTPUT_VARIABLE QTVERSION)
|
||||
if(QTVERSION MATCHES "4.*")
|
||||
set(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "QT4 qmake program.")
|
||||
set(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt4 qmake program.")
|
||||
set(QT4_INSTALLED TRUE)
|
||||
endif()
|
||||
if(QTVERSION MATCHES "Unknown")
|
||||
|
|
@ -115,14 +115,14 @@ endif()
|
|||
|
||||
if(QT3_INSTALLED AND QT4_INSTALLED )
|
||||
# force user to pick if we have both
|
||||
set(DESIRED_QT_VERSION 0 CACHE STRING "Pick a version of QT to use: 3 or 4")
|
||||
set(DESIRED_QT_VERSION 0 CACHE STRING "Pick a version of Qt to use: 3 or 4")
|
||||
else()
|
||||
# if only one found then pick that one
|
||||
if(QT3_INSTALLED)
|
||||
set(DESIRED_QT_VERSION 3 CACHE STRING "Pick a version of QT to use: 3 or 4")
|
||||
set(DESIRED_QT_VERSION 3 CACHE STRING "Pick a version of Qt to use: 3 or 4")
|
||||
endif()
|
||||
if(QT4_INSTALLED)
|
||||
set(DESIRED_QT_VERSION 4 CACHE STRING "Pick a version of QT to use: 3 or 4")
|
||||
set(DESIRED_QT_VERSION 4 CACHE STRING "Pick a version of Qt to use: 3 or 4")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
@ -139,21 +139,21 @@ endif()
|
|||
|
||||
if(NOT QT3_INSTALLED AND NOT QT4_INSTALLED)
|
||||
if(QT_REQUIRED)
|
||||
message(SEND_ERROR "CMake was unable to find any QT versions, put qmake in your path, or set QT_QMAKE_EXECUTABLE.")
|
||||
message(SEND_ERROR "CMake was unable to find any Qt versions, put qmake in your path, or set QT_QMAKE_EXECUTABLE.")
|
||||
endif()
|
||||
else()
|
||||
if(NOT QT_FOUND AND NOT DESIRED_QT_VERSION)
|
||||
if(QT_REQUIRED)
|
||||
message(SEND_ERROR "Multiple versions of QT found please set DESIRED_QT_VERSION")
|
||||
message(SEND_ERROR "Multiple versions of Qt found please set DESIRED_QT_VERSION")
|
||||
else()
|
||||
message("Multiple versions of QT found please set DESIRED_QT_VERSION")
|
||||
message("Multiple versions of Qt found please set DESIRED_QT_VERSION")
|
||||
endif()
|
||||
endif()
|
||||
if(NOT QT_FOUND AND DESIRED_QT_VERSION)
|
||||
if(QT_REQUIRED)
|
||||
message(FATAL_ERROR "CMake was unable to find QT version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE, if those are set then QT_QT_LIBRARY or QT_LIBRARY_DIR.")
|
||||
message(FATAL_ERROR "CMake was unable to find Qt version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE, if those are set then QT_QT_LIBRARY or QT_LIBRARY_DIR.")
|
||||
else()
|
||||
message( "CMake was unable to find desired QT version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE.")
|
||||
message( "CMake was unable to find desired Qt version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE.")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -144,7 +144,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
|
|||
lib
|
||||
)
|
||||
|
||||
# qt 3 should prefer QTDIR over the PATH
|
||||
# Qt 3 should prefer QTDIR over the PATH
|
||||
find_program(QT_MOC_EXECUTABLE
|
||||
NAMES moc-qt3 moc
|
||||
HINTS
|
||||
|
|
@ -168,7 +168,7 @@ if(QT_MOC_EXECUTABLE)
|
|||
set ( QT_WRAP_CPP "YES")
|
||||
endif()
|
||||
|
||||
# qt 3 should prefer QTDIR over the PATH
|
||||
# Qt 3 should prefer QTDIR over the PATH
|
||||
find_program(QT_UIC_EXECUTABLE
|
||||
NAMES uic-qt3 uic
|
||||
HINTS
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# - Find QT 4
|
||||
# - Find Qt 4
|
||||
# This module can be used to find Qt4.
|
||||
# The most important issue is that the Qt4 qmake is available via the system path.
|
||||
# This qmake is then used to detect basically everything else.
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ foreach(i ${squish_env_vars})
|
|||
endforeach()
|
||||
|
||||
if (QT4_INSTALLED)
|
||||
# record qt lib directory
|
||||
# record Qt lib directory
|
||||
set ( ENV{${SQUISH_LIBQTDIR}} ${squish_libqtdir} )
|
||||
endif ()
|
||||
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
#include "cmSourceFile.h"
|
||||
|
||||
/** \class cmQTWrapCPPCommand
|
||||
* \brief Create moc file rules for QT classes
|
||||
* \brief Create moc file rules for Qt classes
|
||||
*
|
||||
* cmQTWrapCPPCommand is used to create wrappers for QT classes into
|
||||
* cmQTWrapCPPCommand is used to create wrappers for Qt classes into
|
||||
* normal C++
|
||||
*/
|
||||
class cmQTWrapCPPCommand : public cmCommand
|
||||
|
|
|
|||
|
|
@ -17,9 +17,9 @@
|
|||
#include "cmSourceFile.h"
|
||||
|
||||
/** \class cmQTWrapUICommand
|
||||
* \brief Create .h and .cxx files rules for QT user interfaces files
|
||||
* \brief Create .h and .cxx files rules for Qt user interfaces files
|
||||
*
|
||||
* cmQTWrapUICommand is used to create wrappers for QT classes into normal C++
|
||||
* cmQTWrapUICommand is used to create wrappers for Qt classes into normal C++
|
||||
*/
|
||||
class cmQTWrapUICommand : public cmCommand
|
||||
{
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ public:
|
|||
"are used to initialize these properties.\n"
|
||||
"PROJECT_LABEL can be used to change the name of "
|
||||
"the target in an IDE like visual studio. VS_KEYWORD can be set "
|
||||
"to change the visual studio keyword, for example QT integration "
|
||||
"to change the visual studio keyword, for example Qt integration "
|
||||
"works better if this is set to Qt4VSv1.0.\n"
|
||||
"VS_SCC_PROJECTNAME, VS_SCC_LOCALPATH, VS_SCC_PROVIDER and "
|
||||
"VS_SCC_AUXPATH can be set "
|
||||
|
|
|
|||
|
|
@ -1071,7 +1071,7 @@ void cmTarget::DefineProperties(cmake *cm)
|
|||
("VS_KEYWORD", cmProperty::TARGET,
|
||||
"Visual Studio project keyword.",
|
||||
"Can be set to change the visual studio keyword, for example "
|
||||
"QT integration works better if this is set to Qt4VSv1.0. ");
|
||||
"Qt integration works better if this is set to Qt4VSv1.0. ");
|
||||
cm->DefineProperty
|
||||
("VS_SCC_PROVIDER", cmProperty::TARGET,
|
||||
"Visual Studio Source Code Control Provider.",
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ endif()
|
|||
set(WRAP ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/Wrap${EXE_EXT})
|
||||
|
||||
#
|
||||
# QT Wrappers
|
||||
# Qt Wrappers
|
||||
#
|
||||
|
||||
set (QT_WRAP_CPP "On")
|
||||
|
|
@ -48,7 +48,7 @@ set (QT_MOC_EXE "echo")
|
|||
include( FindQt3 )
|
||||
|
||||
if (QT_FOUND AND QT_WRAP_UI)
|
||||
message("found qt 3 test it...")
|
||||
message("found Qt 3 test it...")
|
||||
include_directories( ${QT_INCLUDE_DIR} )
|
||||
include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
|
||||
|
||||
|
|
@ -67,8 +67,8 @@ if (QT_FOUND AND QT_WRAP_UI)
|
|||
qt_wrap_ui (myqtlib QTUI_H_SRCS QTUI_S_SRCS ${QTUI_SRCS})
|
||||
qt_wrap_cpp (myqtlib QT_MOC_SRCS ${SRCS} vtkTestMoc.h)
|
||||
|
||||
message("QT files are ${QTUI_S_SRCS}")
|
||||
message("QT other files are ${QTUI_H_SRCS}")
|
||||
message("Qt files are ${QTUI_S_SRCS}")
|
||||
message("Qt other files are ${QTUI_H_SRCS}")
|
||||
add_definitions(${QT_DEFINITIONS})
|
||||
add_library(myqtlib ${QTUI_S_SRCS} ${QT_MOC_SRCS})
|
||||
add_executable (qtwrapping qtwrappingmain.cxx)
|
||||
|
|
|
|||
Loading…
Reference in New Issue