fix qmlplugindump usage

Author: Skycoder42

.qmake.conf

@@ -10,7 +10,7 @@ DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS
 
 MODULE_VERSION_MAJOR = 4
 MODULE_VERSION_MINOR = 1
-MODULE_VERSION_PATCH = 0
+MODULE_VERSION_PATCH = 1
 MODULE_VERSION_IMPORT = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}
 MODULE_VERSION = $${MODULE_VERSION_MAJOR}.$${MODULE_VERSION_MINOR}.$${MODULE_VERSION_PATCH}
 

src/imports/datasync/datasync.pro

@@ -25,21 +25,28 @@ SOURCES +=  \
 
 OTHER_FILES += qmldir
 
-generate_qmltypes {
-	typeextra1.target = qmltypes
-	typeextra1.depends += export LD_LIBRARY_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$(LD_LIBRARY_PATH)"
-	typeextra2.target = qmltypes
-	typeextra2.depends += export QML2_IMPORT_PATH := "$$shadowed($$dirname(_QMAKE_CONF_))/qml/"
-	QMAKE_EXTRA_TARGETS += typeextra1 typeextra2
-}
-
 CONFIG += qmlcache
 load(qml_plugin)
 
 generate_qmltypes {
-	qmltypes.depends = ../../../qml/$$TARGETPATH/$(TARGET)  #overwrite the target deps
+	# run again to overwrite module env
+	ldpath.name = LD_LIBRARY_PATH
+	ldpath.value = "$$shadowed($$dirname(_QMAKE_CONF_))/lib/:$$[QT_INSTALL_LIBS]:$$(LD_LIBRARY_PATH)"
+	qmlpath.name = QML2_IMPORT_PATH
+	qmlpath.value = "$$shadowed($$dirname(_QMAKE_CONF_))/qml/:$$[QT_INSTALL_QML]:$$(QML2_IMPORT_PATH)"
+	PLGDUMP_ENV = ldpath qmlpath
+	QT_TOOL_ENV = ldpath qmlpath
+	qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
+	QT_TOOL_ENV =
+
+	#overwrite the target deps as make target is otherwise not detected
+	qmltypes.depends = ../../../qml/$$TARGETPATH/$(TARGET)
+	OLDDMP = $$take_first(qmltypes.commands)
+	qmltypes.commands = $$QMLPLUGINDUMP $${qmltypes.commands}
+	message("replaced $$OLDDMP with $$QMLPLUGINDUMP")
 
 	mfirst.target = all
 	mfirst.depends += qmltypes
 	QMAKE_EXTRA_TARGETS += mfirst
 }
+