diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:45:32 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:45:32 (GMT) |
| commit | 1898c46452beae9e28cf9be7851099b4b4d2779e (patch) | |
| tree | 00477e689bf1bd867fb3428476029b47817a9db8 /src/tools/moc | |
| parent | f15b8a83e2e51955776a3f07cb85ebfc342dd8ef (diff) | |
| parent | 4d5a5149b716c67f031a3a40e23370f90542c92f (diff) | |
| download | Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.zip Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.tar.gz Qt-1898c46452beae9e28cf9be7851099b4b4d2779e.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachine
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/tools/moc')
| -rwxr-xr-x | src/tools/moc/util/generate.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh index 4c6c431..215b8cb 100755 --- a/src/tools/moc/util/generate.sh +++ b/src/tools/moc/util/generate.sh @@ -1,11 +1,7 @@ #!/bin/sh -p4 edit ../keywords.cpp -p4 edit ../ppkeywords.cpp qmake make cat licenseheader.txt > ../keywords.cpp cat licenseheader.txt > ../ppkeywords.cpp ./generate_keywords >> ../keywords.cpp ./generate_keywords preprocessor >> ../ppkeywords.cpp -p4 revert -a ../keywords.cpp -p4 revert -a ../ppkeywords.cpp |