Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge topic 'automoc_qt5' | David Cole | 2011-11-15 | 1 | -3/+12 |
|\ | | | | | | | | | | | | | bafe5cc Fix style. 74b9392 Update comments and method names to not be Qt4 specific. 812dab0 Don't assume the existence of QT_MAJOR_VERSION. | ||||
| * | Fix style. | Stephen Kelly | 2011-11-09 | 1 | -2/+3 |
| | | |||||
| * | Update comments and method names to not be Qt4 specific. | Stephen Kelly | 2011-11-09 | 1 | -3/+3 |
| | | |||||
| * | Don't assume the existence of QT_MAJOR_VERSION. | Stephen Kelly | 2011-11-09 | 1 | -0/+8 |
| | | | | | | | | Also handle Qt5SrcTools_MAJOR_VERSION. | ||||
* | | Merge topic 'FixAutomocFromCCMakeFromPATH' | David Cole | 2011-11-08 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | 83d02ee make automoc work when using ccmake via PATH (#12551) | ||||
| * | | make automoc work when using ccmake via PATH (#12551) | Alex Neundorf | 2011-11-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | In ccmake, cmake::GetCMakeCommand() returns "/cmake" when ccmake was started from the PATH, i.e. by simply running "ccmake" Alex | ||||
* | | | Merge topic 'AddMocOptionsToAutomoc' | David Cole | 2011-11-08 | 1 | -0/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | 2c648ab add documentation for the AUTOMOC_MOC_OPTIONS property 52719a1 automoc: fix #12541, support moc options | ||||
| * | | | automoc: fix #12541, support moc options | Alex Neundorf | 2011-11-01 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a new target property AUTOMOC_MOC_OPTIONS, which can be set to add extra options for the moc invocations done via automoc. This is equivalent to the OPTIONS parameter in the qt4_wrap_cpp() macro. Alex | ||||
* | | | | Merge topic 'DontCrashAutomocWithEmptyCompileDefs' | David Cole | 2011-11-08 | 1 | -4/+8 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | 1ecc55a Automoc: fix the fix, need to use std::string, not just char* pointer 8c8305f don't crash in automoc with empty COMPILE_DEFINITIONS property | ||||
| * | | Automoc: fix the fix, need to use std::string, not just char* pointer | Alex Neundorf | 2011-11-01 | 1 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | We need to take a copy of the property values, since the returned char* pointer is reused by the following GetProperty() calls Alex | ||||
| * | | don't crash in automoc with empty COMPILE_DEFINITIONS property | Alex Neundorf | 2011-10-31 | 1 | -7/+8 |
| |/ | | | | | | | | | | | | | Reported by Laszlo Papp: http://www.cmake.org/pipermail/cmake/2011-October/047089.html Alex | ||||
* | | Also run moc automatically with Qt5. | Stephen Kelly | 2011-11-01 | 1 | -2/+2 |
|/ | | | | The method of running moc hasn't changed in Qt5. | ||||
* | automoc: always run moc on the cpp file if there is a foo.moc included | Alex Neundorf | 2011-10-22 | 1 | -10/+5 |
| | | | | | | | | | | | | | This makes automoc behaves as the documentation says. If there is a #include "foo.moc" in the source file, moc will be executed on foo.cpp. Before it was also executed on foo.cpp, but only if foo.cpp contained a Q_OBJECT macro, otherwise moc was executed on foo.h. This was confusing, and this change also shouldn't break anything, since the headers are moc'ed anyway if they contain a Q_OBJECT macro. Alex | ||||
* | Add copyright notices | Alex Neundorf | 2011-10-22 | 1 | -0/+13 |
| | | | | Alex | ||||
* | automoc:run moc on the header if the source file contains include "foo.moc" | Alex Neundorf | 2011-10-22 | 1 | -75/+75 |
| | | | | | | | | | | 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 | ||||
* | Create moc files in the current binary dir, not the top level. | Stephen Kelly | 2011-08-25 | 1 | -1/+1 |
| | |||||
* | QtAutomoc: Eliminate compiler warning | David Cole | 2011-08-19 | 1 | -1/+1 |
| | |||||
* | Silence warning in automoc: use long instead of int | Alex Neundorf | 2011-08-18 | 1 | -1/+1 |
| | | | | Alex | ||||
* | Fix build: use std::ios::out|ios::trunc instead of std::ios_base::out | Alex Neundorf | 2011-08-18 | 1 | -2/+2 |
| | | | | Alex | ||||
* | Fix warnings | Alex Neundorf | 2011-08-16 | 1 | -6/+7 |
| | | | | Alex | ||||
* | Fix build: non-void function must return a value | Alex Neundorf | 2011-08-16 | 1 | -1/+1 |
| | | | | Alex | ||||
* | Nicer progress message for the automoc target | Alex Neundorf | 2011-08-16 | 1 | -2/+4 |
| | | | | Alex | ||||
* | Refactor SetupAutomocTarget() so it can be run after creating the target | Alex Neundorf | 2011-08-15 | 1 | -36/+21 |
| | | | | | | | This makes it easier to move it from InitialPass() to some other location, e.g. FinalPass() or something else. Alex | ||||
* | Use cout instead of printf() | Alex Neundorf | 2011-08-14 | 1 | -8/+8 |
| | | | | Alex | ||||
* | Add the generated automoc.cpp file to the cleaned files | Alex Neundorf | 2011-08-14 | 1 | -0/+2 |
| | | | | Alex | ||||
* | Color output when running moc | Alex Neundorf | 2011-08-14 | 1 | -8/+22 |
| | | | | Alex | ||||
* | Initialize verbose based onb the env.var. | Alex Neundorf | 2011-08-14 | 1 | -1/+1 |
| | | | | Alex | ||||
* | Move code for parsing a cpp-file from the big loop to separate function | Alex Neundorf | 2011-08-14 | 1 | -183/+182 |
| | | | | Alex | ||||
* | Fix line lengths | Alex Neundorf | 2011-08-14 | 1 | -49/+60 |
| | | | | Alex | ||||
* | Add the cmake module required currently for automoc | Alex Neundorf | 2011-08-14 | 1 | -0/+126 |
| | | | | Alex | ||||
* | Remove the need to check for .h/.cxx during buildtime | Alex Neundorf | 2011-08-14 | 1 | -144/+142 |
| | | | | | | | Instead it now relies on cmake time to put that information correctly into AutomocInfo.cmake Alex | ||||
* | Add actual automoc code from automoc | Alex Neundorf | 2011-08-14 | 1 | -6/+560 |
| | | | | | | | | | It already works :-) Needs more refactoring, e.g. using the cmake facilities to turn a string into a vector etc. Also still missing is the part which creates the custom target. Alex | ||||
* | Start implementing skeleton for automoc in cmake | Alex Neundorf | 2011-08-14 | 1 | -0/+80 |
| | | | | Alex | ||||
* | Start work on automoc: add empty cmQtAutomoc class | Alex Neundorf | 2011-08-07 | 1 | -0/+10 |
Alex |