From 99714239b616e628ff4e0afe3db7eb7511ccf569 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 23 Jan 2017 18:18:32 +0100
Subject: fix usage of qt deployment paths

QT_INSTALL_*/dev properties have been added to qmake a while ago.
catch up with that.

Change-Id: I2bda68a1d4700c762a3d12600ac6aba123d4d0f8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/shared/proparser/qmakeglobals.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/shared/proparser')

diff --git a/src/shared/proparser/qmakeglobals.cpp b/src/shared/proparser/qmakeglobals.cpp
index a1d19892b9d..a50fa5437a0 100644
--- a/src/shared/proparser/qmakeglobals.cpp
+++ b/src/shared/proparser/qmakeglobals.cpp
@@ -351,7 +351,7 @@ void QMakeGlobals::parseProperties(const QByteArray &data, QHash<ProKey, ProStri
                     variant = PropRaw;
                 else if (name.endsWith(QLatin1String("/get")))
                     variant = PropGet;
-                else  // Nothing falls back on /src.
+                else  // Nothing falls back on /src or /dev.
                     continue;
                 name.chop(4);
             } else {
@@ -372,6 +372,8 @@ void QMakeGlobals::parseProperties(const QByteArray &data, QHash<ProKey, ProStri
                     }
                     properties.insert(ProKey(name + QLatin1String("/raw")), value);
                 }
+                if (variant <= PropRaw)
+                    properties.insert(ProKey(name + QLatin1String("/dev")), value);
             } else if (!name.startsWith(QLatin1String("QT_HOST_"))) {
                 continue;
             }
-- 
cgit v1.2.3