diff options
| author | Stephen Kelly <steveire@gmail.com> | 2011-11-26 14:15:33 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2011-11-26 14:15:33 (GMT) |
| commit | a8286235a31437505a53f5874e8bf98524b6dca3 (patch) | |
| tree | 94e4a78497b76b6890b48a826962d2eaac67b2e0 | |
| parent | b8c8cab2428b10d5a1cb3af4ae72bc3c3f091f4d (diff) | |
| download | CMake-a8286235a31437505a53f5874e8bf98524b6dca3.zip CMake-a8286235a31437505a53f5874e8bf98524b6dca3.tar.gz CMake-a8286235a31437505a53f5874e8bf98524b6dca3.tar.bz2 | |
moc is now part of the Qt5Core module
There is no separate SrcTools module anymore.
| -rw-r--r-- | Modules/AutomocInfo.cmake.in | 2 | ||||
| -rw-r--r-- | Source/cmQtAutomoc.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Modules/AutomocInfo.cmake.in b/Modules/AutomocInfo.cmake.in index 8542ff6..2c7c724 100644 --- a/Modules/AutomocInfo.cmake.in +++ b/Modules/AutomocInfo.cmake.in @@ -11,5 +11,5 @@ set(AM_QT_MOC_EXECUTABLE "@QT_MOC_EXECUTABLE@") set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/") set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/") set(AM_QT_VERSION_MAJOR "@QT_VERSION_MAJOR@" ) -set(AM_Qt5SrcTools_VERSION_MAJOR "@Qt5SrcTools_VERSION_MAJOR@" ) +set(AM_Qt5Core_VERSION_MAJOR "@Qt5Core_VERSION_MAJOR@" ) set(AM_TARGET_NAME "@_moc_target_name@") diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx index 7a80f28..d07f84b 100644 --- a/Source/cmQtAutomoc.cxx +++ b/Source/cmQtAutomoc.cxx @@ -49,11 +49,11 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target) { cmMakefile* makefile = target->GetMakefile(); const char* targetName = target->GetName(); - // don't do anything if there is no Qt4 or Qt5SrcTools (which contains moc): + // don't do anything if there is no Qt4 or Qt5Core (which contains moc): std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR"); if (qtMajorVersion == "") { - qtMajorVersion = makefile->GetSafeDefinition("Qt5SrcTools_VERSION_MAJOR"); + qtMajorVersion = makefile->GetSafeDefinition("Qt5Core_VERSION_MAJOR"); } if (qtMajorVersion != "4" && qtMajorVersion != "5") { @@ -229,7 +229,7 @@ bool cmQtAutomoc::ReadAutomocInfoFile(cmMakefile* makefile, if (this->QtMajorVersion == "") { this->QtMajorVersion = makefile->GetSafeDefinition( - "AM_Qt5SrcTools_VERSION_MAJOR"); + "AM_Qt5Core_VERSION_MAJOR"); } this->Sources = makefile->GetSafeDefinition("AM_SOURCES"); this->Headers = makefile->GetSafeDefinition("AM_HEADERS"); |