summaryrefslogtreecommitdiffstats
path: root/Source/cmQtAutomoc.h
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-11-15 19:39:00 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-11-15 19:39:00 (GMT)
commit1e055d374e08552522216c1dc4bc68ab876e922f (patch)
treec40760fa7ec99b9426b4730a4f270bd89ae157ba /Source/cmQtAutomoc.h
parentf1197ff0dac1ab02b7515d79a2c46075538360c5 (diff)
parentbafe5cc6e90ebb510dfe992c8a7a1eca55826813 (diff)
downloadCMake-1e055d374e08552522216c1dc4bc68ab876e922f.zip
CMake-1e055d374e08552522216c1dc4bc68ab876e922f.tar.gz
CMake-1e055d374e08552522216c1dc4bc68ab876e922f.tar.bz2
Merge topic 'automoc_qt5'
bafe5cc Fix style. 74b9392 Update comments and method names to not be Qt4 specific. 812dab0 Don't assume the existence of QT_MAJOR_VERSION.
Diffstat (limited to 'Source/cmQtAutomoc.h')
-rw-r--r--Source/cmQtAutomoc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmQtAutomoc.h b/Source/cmQtAutomoc.h
index db53b21..f6355de 100644
--- a/Source/cmQtAutomoc.h
+++ b/Source/cmQtAutomoc.h
@@ -35,7 +35,7 @@ private:
const char* targetDirectory);
void WriteOldMocDefinitionsFile(const char* targetDirectory);
- bool RunAutomocQt4();
+ bool RunAutomoc();
bool GenerateMoc(const std::string& sourceFile,
const std::string& mocFileName);
void ParseCppFile(const std::string& absFilename,