From f9b61eca4e48f59a2d4c3b9f131b88d4e7c3b6a9 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Mon, 2 Jun 2014 13:40:53 +0200
Subject: [PATCH] use the right env var in qmlplugindump call

qml2 needs QML2_IMPORT_PATH.
this didn't affect non-prefix builds (which most developers use), so
it wasn't too serious.

Change-Id: I435dca151348669b66f091f9a9324cd69394284e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 mkspecs/features/qml_plugin.prf | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index ad55b889acb..bfd01c6eda2 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -75,10 +75,13 @@ load(qt_common)
         }
 
         load(resolve_target)
-        qml1_target: \
+        qml1_target {
             qmlplugindump = qml1plugindump
-        else: \
+            importpath.name = QML_IMPORT_PATH
+        } else {
             qmlplugindump = qmlplugindump
+            importpath.name = QML2_IMPORT_PATH
+        }
         qtPrepareTool(QMLPLUGINDUMP, $$qmlplugindump)
         importpath.value =
         for(qmod, QTREPOS) {
@@ -88,7 +91,6 @@ load(qt_common)
                 qmod = $$qmod/qml
             exists($$qmod): importpath.value += $$shell_path($$qmod)
         }
-        importpath.name = QML_IMPORT_PATH
         importpath.value = $$unique(importpath.value)
         qtAddToolEnv(QMLPLUGINDUMP, importpath)
         TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )