diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-03-02 17:52:12 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-08 18:55:53 +0100 |
| commit | d6206075be868adda80d3d3468b126b77b489bca (patch) | |
| tree | aba05a662c99725d55f895fb79045badc5da0280 | |
| parent | 59ae59977b05b0edf2ae841fc5149bdb401d8164 (diff) | |
remove automatic building of moc from moc.prf
the problem this (probably) tried to solve has been solved via ordered
builds a *long* time ago.
Change-Id: I84c58076c864735eea4210ec60aa060fe3e5d97e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | mkspecs/features/moc.prf | 6 |
2 files changed, 0 insertions, 7 deletions
@@ -6731,7 +6731,6 @@ QMAKE_LIBDIR_QT = \$\$QT_BUILD_TREE/lib include(\$\$PWD/mkspecs/qmodule.pri) CONFIG += $QMAKE_CONFIG dylib depend_includepath fix_output_dirs no_private_qt_headers_warning QTDIR_build QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOURCE_TREE -QMAKE_MOC_SRC = \$\$QT_BUILD_TREE/src/moc EOF 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 |