diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-03-04 18:22:02 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-03-04 18:22:02 (GMT) |
| commit | 2542f8b565e90378145c048b3a6982f4749c6392 (patch) | |
| tree | d48a2a8988a778e16cf73aac4d0b5709b82f0082 /src/tools/moc/util/generate_keywords.pro | |
| parent | 4f2203e481cc1663776e7b87b082cf0dd42849fd (diff) | |
| parent | 364ba2bfeeab574d2ae940e4387d3c90b2a46dcd (diff) | |
| download | Qt-2542f8b565e90378145c048b3a6982f4749c6392.zip Qt-2542f8b565e90378145c048b3a6982f4749c6392.tar.gz Qt-2542f8b565e90378145c048b3a6982f4749c6392.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/tools/moc/util/generate_keywords.pro')
| -rw-r--r-- | src/tools/moc/util/generate_keywords.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/tools/moc/util/generate_keywords.pro b/src/tools/moc/util/generate_keywords.pro index 8dff744..eb04409 100644 --- a/src/tools/moc/util/generate_keywords.pro +++ b/src/tools/moc/util/generate_keywords.pro @@ -10,4 +10,3 @@ INCLUDEPATH += . # Input SOURCES += generate_keywords.cpp CONFIG += qt create_prl link_prl -OBJECTS_DIR=.obj/debug-shared |