AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deprecate DEPLOYMENT variable

Browse Source 
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 <oliver.wolff@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Joerg Bornemann 2015-05-26 17:32:47 +02:00
parent 9b0809d50a
commit a1c0a59ce6
5 changed files with 11 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt.prf
View File

@ -260,7 +260,7 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
eval(qt_additional_plugin_$${QTPLUG}.files = $$[QT_INSTALL_PLUGINS/get]/$${QT_PLUGINPATH}/$${QT_ITEM})
eval(qt_additional_plugin_$${QTPLUG}.path = $${QT_PLUGINPATH})
DEPLOYMENT *= qt_additional_plugin_$${QTPLUG}
INSTALLS *= qt_additional_plugin_$${QTPLUG}
}
}
}

15
qmake/doc/snippets/code/doc_src_qmake-manual.pro
View File

@ -186,21 +186,6 @@ DEFINES += USE_MY_STUFF
#! [27]
#! [28]
myFiles.files = path\*.png
DEPLOYMENT += myFiles
#! [28]
#! [29]
myFiles.files = path\file1.ext1 path2\file2.ext1 path3\*
myFiles.path = \some\path\on\device
someother.files = C:\additional\files\*
someother.path = \myFiles\path2
DEPLOYMENT += myFiles someother
#! [29]
#! [30]
DESTDIR = ../../lib
#! [30]

39
qmake/doc/src/qmake-manual.qdoc
View File

@ -1120,38 +1120,6 @@
Specifies a list of all directories to look in to resolve dependencies. This
variable is used when crawling through \c included files.
\target DEPLOYMENT
\section1 DEPLOYMENT
\note This variable is used only on the Windows CE platform.
Specifies which additional files will be deployed. Deployment means the
transfer of files from the development system to the target device or
emulator.
Files can be deployed by either creating a Visual Studio project or using
the \l {Using Qt Test remotely on Windows CE}{cetest} executable.
For example, the following definition uploads all PNG images in \c path to
the directory where the build target is deployed:
\snippet code/doc_src_qmake-manual.pro 28
The default deployment target path for Windows CE is
\c{%CSIDL_PROGRAM_FILES%\target}, which usually gets expanded to
\c{\Program Files\target}.
It is also possible to specify multiple \c sources to be deployed on
target \c paths. In addition, different variables can be used for
deployment to different directories.
For example:
\snippet code/doc_src_qmake-manual.pro 29
\note In Windows CE all linked Qt libraries will be deployed to the path
specified by \c{myFiles.path}.
\target DEPLOYMENT_PLUGIN
\section1 DEPLOYMENT_PLUGIN
@ -1276,6 +1244,13 @@
For more information, see \l{Installing Files}.
This variable is also used to specify which additional files will be
deployed to embedded devices.
For Windows CE, the default deployment target path is
\c{%CSIDL_PROGRAM_FILES%\target}, which usually gets expanded to
\c{\Program Files\target}.
\target LEXIMPLS
\section1 LEXIMPLS

3
qmake/generators/win32/msvc_vcproj.cpp
View File

@ -1374,8 +1374,7 @@ void VcprojGenerator::initDeploymentTool()
}
}
// foreach item in DEPLOYMENT
foreach (const ProString &item, project->values("DEPLOYMENT")) {
foreach (const ProString &item, project->values("INSTALLS")) {
// get item.path
QString devicePath = project->first(ProKey(item + ".path")).toQString();
if (!conf.WinRT) {

3
qmake/library/qmakeevaluator.cpp
View File

@ -188,7 +188,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));