diff options
| author | axis <qt-info@nokia.com> | 2010-02-16 09:00:23 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-16 09:00:23 (GMT) |
| commit | 9d174f13e48730ac06aa429e0f011a02b333025e (patch) | |
| tree | 6075fa3c24880dd6fc548f03395a5809739f67de /mkspecs | |
| parent | 4790ab735f96a13027e7292ff5b49195224f0af9 (diff) | |
| parent | e024cc10a97b9518b2dd577175feb66258d7ac05 (diff) | |
| download | Qt-9d174f13e48730ac06aa429e0f011a02b333025e.zip Qt-9d174f13e48730ac06aa429e0f011a02b333025e.tar.gz Qt-9d174f13e48730ac06aa429e0f011a02b333025e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/moc.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 42ce1bc..e4b7dae 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -97,7 +97,7 @@ equals(MOC_DIR, .) { } #auto depend on moc -unix:!no_mocdepend { +unix:!symbian:!no_mocdepend { moc_source.depends += $$first(QMAKE_MOC) moc_header.depends += $$first(QMAKE_MOC) !contains(TARGET, moc) { #auto build moc |