diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2012-03-12 21:03:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2012-03-12 21:03:49 +0100 |
| commit | d5098f2802255da10b749b93705084ad1fdfc6a5 (patch) | |
| tree | 6462008a4ab7d13435d93490fed96c62c516cbdf /mkspecs/features/moc.prf | |
| parent | d5a85940f785459d7b982d5fdf59a9fd18825092 (diff) | |
| parent | b5b41c18345719612e5411cc482466d2dbafdaf7 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
tests/auto/corelib/kernel/qmetatype/tst_qmetatype.cpp
Change-Id: I884afc3b6d65c6411733a897a1949e19393573a7
Diffstat (limited to 'mkspecs/features/moc.prf')
| -rw-r--r-- | mkspecs/features/moc.prf | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 3f155a2d6b..94f8100f88 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -97,12 +97,6 @@ equals(MOC_DIR, .) { unix:!no_mocdepend { moc_source.depends += $$first(QMAKE_MOC) moc_header.depends += $$first(QMAKE_MOC) - !contains(TARGET, moc) { #auto build moc - isEmpty(QMAKE_MOC_SRC):QMAKE_MOC_SRC = "$(QTDIR)/src/tools/moc" - make_moc.target = $$first(QMAKE_MOC) - make_moc.commands = (cd $$QMAKE_MOC_SRC && $(MAKE)) - QMAKE_EXTRA_TARGETS += make_moc - } } #generate a mocclean |