This commit is contained in:
Franck Bettinger 2001-11-09 12:07:37 -05:00
parent becce939a2
commit 53d0de2a9f
2 changed files with 7 additions and 3 deletions

View File

@ -103,7 +103,6 @@ bool cmQTWrapCPPCommand::InitialPass(std::vector<std::string> const& args)
// add starting depends // add starting depends
file.GetDepends().push_back(hname); file.GetDepends().push_back(hname);
m_WrapClasses.push_back(file); m_WrapClasses.push_back(file);
m_OriginalNames.push_back(curr.GetSourceName());
} }
} }
} }
@ -123,7 +122,13 @@ void cmQTWrapCPPCommand::FinalPass()
// wrap all the .h files // wrap all the .h files
depends.push_back(moc_exe); depends.push_back(moc_exe);
std::string moc_list(""); const char * GENERATED_QT_FILES_value=
m_Makefile->GetDefinition("GENERATED_QT_FILES");
std::string moc_list("");
if (GENERATED_QT_FILES_value!=0)
{
moc_list=moc_list+GENERATED_QT_FILES_value;
}
for(int classNum = 0; classNum < lastClass; classNum++) for(int classNum = 0; classNum < lastClass; classNum++)
{ {

View File

@ -68,7 +68,6 @@ private:
* List of header files that pprovide the source for m_WrapClasses. * List of header files that pprovide the source for m_WrapClasses.
*/ */
std::vector<std::string> m_WrapHeaders; std::vector<std::string> m_WrapHeaders;
std::vector<std::string> m_OriginalNames;
std::string m_LibraryName; std::string m_LibraryName;
std::string m_SourceList; std::string m_SourceList;
}; };