summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure1
-rw-r--r--mkspecs/features/moc.prf6
2 files changed, 0 insertions, 7 deletions
diff --git a/configure b/configure
index 151ddb046f..8df49a9928 100755
--- a/configure
+++ b/configure
@@ -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