From b1888c76bad1e5704d35c155c2b45c23a2d26fa1 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Mon, 2 Jul 2012 16:33:42 +0200
Subject: [PATCH] adjust deployment.pri to DEPLOYMENT variable changes in Qt 5
X.sources has been deprecated in Qt 4.8.0 and removed in Qt 5.
Change-Id: I3d5228bd6db6d3eaccd76fc49e9b934263f9922c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
---
share/qtcreator/templates/shared/deployment.pri | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri
index bd7a4c0226e..140e0605e59 100644
--- a/share/qtcreator/templates/shared/deployment.pri
+++ b/share/qtcreator/templates/shared/deployment.pri
@@ -7,7 +7,11 @@
defineTest(qtcAddDeployment) {
for(deploymentfolder, DEPLOYMENTFOLDERS) {
item = item$${deploymentfolder}
- itemsources = $${item}.sources
+ greaterThan(QT_MAJOR_VERSION, 4) {
+ itemsources = $${item}.files
+ } else {
+ itemsources = $${item}.sources
+ }
$$itemsources = $$eval($${deploymentfolder}.source)
itempath = $${item}.path
$$itempath= $$eval($${deploymentfolder}.target)
--
GitLab