[Cmake-commits] CMake branch, next, updated. v2.8.6-1829-g3e48a4a
Stephen Kelly
steveire at gmail.com
Wed Nov 9 18:57:49 EST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3e48a4a914942073f4aedc98ea309d3703876b0e (commit)
via bafe5cc6e90ebb510dfe992c8a7a1eca55826813 (commit)
from 6fe404e26378f026f3d730dc985a933b09252e0d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3e48a4a914942073f4aedc98ea309d3703876b0e
commit 3e48a4a914942073f4aedc98ea309d3703876b0e
Merge: 6fe404e bafe5cc
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 9 18:57:47 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 9 18:57:47 2011 -0500
Merge topic 'automoc_qt5' into next
bafe5cc Fix style.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bafe5cc6e90ebb510dfe992c8a7a1eca55826813
commit bafe5cc6e90ebb510dfe992c8a7a1eca55826813
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 10 00:57:21 2011 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 10 00:57:21 2011 +0100
Fix style.
diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 861e5bb..72249bc 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -53,7 +53,7 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
std::string qtMajorVersion = makefile->GetSafeDefinition("QT_VERSION_MAJOR");
if (qtMajorVersion == "")
{
- qtMajorVersion = makefile->GetSafeDefinition("Qt5SrcTools_VERSION_MAJOR");
+ qtMajorVersion = makefile->GetSafeDefinition("Qt5SrcTools_VERSION_MAJOR");
}
if (qtMajorVersion != "4" && qtMajorVersion != "5")
{
@@ -221,7 +221,8 @@ bool cmQtAutomoc::ReadAutomocInfoFile(cmMakefile* makefile,
this->QtMajorVersion = makefile->GetSafeDefinition("AM_QT_VERSION_MAJOR");
if (this->QtMajorVersion == "")
{
- this->QtMajorVersion = makefile->GetSafeDefinition("AM_Qt5SrcTools_VERSION_MAJOR");
+ this->QtMajorVersion = makefile->GetSafeDefinition(
+ "AM_Qt5SrcTools_VERSION_MAJOR");
}
this->Sources = makefile->GetSafeDefinition("AM_SOURCES");
this->Headers = makefile->GetSafeDefinition("AM_HEADERS");
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutomoc.cxx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list