Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Don't assume the existence of QT_MAJOR_VERSION. | Stephen Kelly | 2011-11-09 | 1 | -0/+8 | |
| |/ / | | | | | | | | | | Also handle Qt5SrcTools_MAJOR_VERSION. | |||||
| * | | 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: fix line length | Alex Neundorf | 2011-12-06 | 1 | -1/+1 | |
| | | | | | | | | Alex | |||||
* | | automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsing | Alex Neundorf | 2011-12-02 | 1 | -2/+11 | |
| | | | | | | | | Alex | |||||
* | | automoc: accept even more .moc files in non-strict mode | Alex Neundorf | 2011-12-02 | 1 | -56/+25 | |
| | | | | | | | | Alex | |||||
* | | automoc: also accept other files when .moc is included in non-strict mode | Alex Neundorf | 2011-12-02 | 1 | -20/+14 | |
| | | | | | | | | Alex | |||||
* | | automoc: add a StrictParseCppFile(), which is only qmake-compatible | Alex Neundorf | 2011-12-02 | 1 | -6/+122 | |
| | | | | | | | | | | | | | | | | ParseCppFile() is the one which is automoc4/KDE4-compatible, and which becomes a bit crowded. By separating these two it is easier to ensure that the strict one doesn't get broken accidentially. Alex | |||||
* | | automoc: move the code for finding headers into separate function | Alex Neundorf | 2011-12-02 | 1 | -19/+31 | |
| | | | | | | | | Alex | |||||
* | | automoc: fix handling of included _p.moc files | Alex Neundorf | 2011-11-30 | 1 | -2/+3 | |
| | | | | | | | | Alex | |||||
* | | automoc: some more linebreaks for the warnings for better readability | Alex Neundorf | 2011-11-29 | 1 | -8/+8 | |
| | | | | | | | | Alex | |||||
* | | automoc: add extra check whether the header contains Q_PRIVATE_SLOT | Alex Neundorf | 2011-11-29 | 1 | -1/+50 | |
| | | | | | | | | | | | | | | | | | | | | | | This is again for KDE4 compatiblity. If foo.moc is included, in general moc should run on foo.cpp. Usually this can't cause problems. It can only cause problems if moc must run on the header, and the resulting file must be included in the cpp file, which is the case with the Q_PRIVATE_SLOT macro. This makes the test added by Stephen pass. Alex | |||||
* | | automoc: add special handling for including basename_p.moc, with test | Alex Neundorf | 2011-11-22 | 1 | -7/+32 | |
| | | | | | | | | Alex | |||||
* | | automoc: move some code from the big parsing loop into separate functions | Alex Neundorf | 2011-11-22 | 1 | -30/+47 | |
| | | | | | | | | Alex | |||||
* | | Automoc: modified handling of included .moc files | Alex Neundorf | 2011-11-16 | 1 | -3/+14 | |
| | | | | | | | | | | | | | | | | -enable the KDE4-compatiblity mode only when using Qt4 -always (except in the KDE4 compat mode) error out if a cpp-file contains "Q_OBJECT", but does not include filename.moc Alex | |||||
* | | automoc: another runtime optimization | Alex Neundorf | 2011-11-10 | 1 | -6/+23 | |
| | | | | | | | | | | | | | | before doing the full regexp, try a simple strstr(), if this already fails, no need to do the regexp matching. Alex | |||||
* | | automoc: minor optimization | Alex Neundorf | 2011-11-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | Handing th std::string instead the char* to the find() reduces the time from 17 to 15 seconds (for a 1000 times loop of a relatively small file), which is around 10 percent. Alex | |||||
* | | automoc: improved diagnostics | Alex Neundorf | 2011-11-10 | 1 | -10/+11 | |
| | | | | | | | | | | | | | | Error/warning messages now look like: AUTOMOC: (error|warning): <filename>: the actual text... Alex | |||||
* | | automoc: handle the case when the developer includes the wrong mocfile | Alex Neundorf | 2011-11-10 | 1 | -0/+33 | |
| | | | | | | | | | | | | | | | | | | | | There are multiple/many places in KDE where the developer includes moc_foo.cpp, and expects moc to run on foo.cpp, instead of foo.h. He should use foo.moc, but right now this is handled by automoc4, so we must stay compatible. So support this too, but warn about it. Alex | |||||
* | | automoc: rework the checking for the matching header, to give better warnings | Alex Neundorf | 2011-11-10 | 1 | -42/+35 | |
| | | | | | | | | Alex | |||||
* | | automoc: stricter checking for what file is included | Alex Neundorf | 2011-11-10 | 1 | -0/+12 | |
|/ | | | | | | foo.cpp must include foo.moc to have itself processed by moc Alex | |||||
* | 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 |