summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-07-13 13:14:19 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-07-13 13:26:08 (GMT)
commiteb594be13ae17361c1de3539e34e84a1d8c324c5 (patch)
tree9aa0047b4d3150ec6c93f99112f1c25d2eebcea8 /qmake
parent32182d107fa75e5619ecc91a81f50626f429ebe1 (diff)
downloadQt-eb594be13ae17361c1de3539e34e84a1d8c324c5.zip
Qt-eb594be13ae17361c1de3539e34e84a1d8c324c5.tar.gz
Qt-eb594be13ae17361c1de3539e34e84a1d8c324c5.tar.bz2
fix bug in qmake DEPLOYMENT variable
The documentation states "The default deployment target path for Windows CE is %CSIDL_PROGRAM_FILES%\target, which usually gets expanded to \Program Files\target." Now this statement is true. Task-number: 257053 Reviewed-by: mauricek
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 50f78d7..5f250bf 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1239,9 +1239,8 @@ void VcprojGenerator::initDeploymentTool()
foreach(QString item, project->values("DEPLOYMENT")) {
// get item.path
QString devicePath = project->first(item + ".path");
- // if the path does not exist, skip it
if (devicePath.isEmpty())
- continue;
+ devicePath = targetPath;
// check if item.path is relative (! either /,\ or %)
if (!(devicePath.at(0) == QLatin1Char('/')
|| devicePath.at(0) == QLatin1Char('\\')