diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-08 08:12:52 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-10-08 12:12:16 (GMT) |
| commit | 269821d9a1eda2893f84fdeff76edef576f9847d (patch) | |
| tree | 2b351f82f43c797ec4c1b2b43d2f243788f33d7a /qmake/generators/win32 | |
| parent | 392ecc76cdbcef37ee492400a1b783106a37ad36 (diff) | |
| download | Qt-269821d9a1eda2893f84fdeff76edef576f9847d.zip Qt-269821d9a1eda2893f84fdeff76edef576f9847d.tar.gz Qt-269821d9a1eda2893f84fdeff76edef576f9847d.tar.bz2 | |
Inconsistency with deployment keyword .sources and .files.
The DEPLOYMENT instruction uses .sources, while INSTALLS uses .files.
This is inconsistent, and we fix it in Qt 4 by adding .files as a
supported alternative for DEPLOYMENT.
This commit will be followed by a second, which aligns Qt build system.
For Qt 5, this needs to be cleaned up by removing support for .sources.
Task-number: QTBUG-3216
Reviewed-by: João Abecasis
Cherry-picked from 730a5d562fcb7be6428458962456033054f99e4c by
Frans Englich.
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 06b726f..8582ce1 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1174,7 +1174,8 @@ void VcprojGenerator::initDeploymentTool() devicePath = Option::fixPathToLocalOS(QDir::cleanPath(targetPath + QLatin1Char('\\') + devicePath)); } // foreach d in item.sources - foreach(QString source, project->values(item + ".sources")) { + // ### Qt 5: remove .sources, inconsistent with INSTALLS + foreach(QString source, project->values(item + ".sources") + project->values(item + ".files")) { QString itemDevicePath = devicePath; source = Option::fixPathToLocalOS(source); QString nameFilter; |