diff options
| author | Alex Neundorf <neundorf@kde.org> | 2011-10-22 17:38:39 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2011-10-22 17:38:39 (GMT) |
| commit | 56aa6ffae75dd2567d2041147774bb1a9a3a1bdf (patch) | |
| tree | 378c183d5b02a87b81b667d6f6498b45e2921bb8 /Source/cmQtAutomoc.h | |
| parent | af772893b856b50697f18c9bb7b1a0fb326cf715 (diff) | |
| download | CMake-56aa6ffae75dd2567d2041147774bb1a9a3a1bdf.zip CMake-56aa6ffae75dd2567d2041147774bb1a9a3a1bdf.tar.gz CMake-56aa6ffae75dd2567d2041147774bb1a9a3a1bdf.tar.bz2 | |
automoc:run moc on the header if the source file contains include "foo.moc"
This fixes #12533.
Before automoc did not check the header if the source file contained a
statement, now it does.
Additionally, moc is now only run on explicitely listed headers which
contain a Q_OBJECT macro.
Alex
Diffstat (limited to 'Source/cmQtAutomoc.h')
| -rw-r--r-- | Source/cmQtAutomoc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmQtAutomoc.h b/Source/cmQtAutomoc.h index 4fd9041..8fb790a 100644 --- a/Source/cmQtAutomoc.h +++ b/Source/cmQtAutomoc.h @@ -27,6 +27,9 @@ private: const std::string& mocFileName); void ParseCppFile(const std::string& absFilename, std::map<std::string, std::string>& includedMocs, + std::set<std::string>& absHeaders); + void ParseHeaders(const std::set<std::string>& absHeaders, + const std::map<std::string, std::string>& includedMocs, std::map<std::string, std::string>& notIncludedMocs); void Init(); |