From fa6d0f1231a5f2a597489120f1b506d092b8520a Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 26 May 2015 17:32:47 +0200 Subject: [PATCH] deprecate DEPLOYMENT variable Deprecate the qmake variable DEPLOYMENT that was used for installing files on remote devices for Windows RT and Windows CE Visual Studio projects. Use INSTALLS for both nmake and Visual Studio projects. [ChangeLog][core][qmake] Deprecated the qmake variable DEPLOYMENT in favor of INSTALLS. Task-number: QTBUG-21854 Change-Id: Ia9d2c69feb7d87b0b9dc69ff7c0a68be35a57acd Reviewed-by: Oliver Wolff Reviewed-by: Oswald Buddenhagen (cherry picked from qtbase/a1c0a59ce6488134a38552fd12c831d2aa0f2693) Reviewed-by: Joerg Bornemann --- src/shared/proparser/qmakeevaluator.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 08c1e08fafc..ef8179065af 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -185,7 +185,8 @@ void QMakeEvaluator::initStatics() { "QMAKE_RPATH", "QMAKE_LFLAGS_RPATH" }, { "QMAKE_FRAMEWORKDIR", "QMAKE_FRAMEWORKPATH" }, { "QMAKE_FRAMEWORKDIR_FLAGS", "QMAKE_FRAMEWORKPATH_FLAGS" }, - { "IN_PWD", "PWD" } + { "IN_PWD", "PWD" }, + { "DEPLOYMENT", "INSTALLS" } }; for (unsigned i = 0; i < sizeof(mapInits)/sizeof(mapInits[0]); ++i) statics.varMap.insert(ProKey(mapInits[i].oldname), ProKey(mapInits[i].newname));