summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2009-08-10 07:36:49 (GMT)
committerKeith Isdale <keith.isdale@nokia.com>2009-08-10 07:36:49 (GMT)
commit4942e2834c1da00bfceec6430ce351888efc1976 (patch)
tree944be213e12faa16fb260f5dec4f97d5fcc7c5fc /qmake
parent6cc14b9bd84de30471db40f73b119ba33356a6ba (diff)
parent5d01d0cde28f2ac1ff9b5d8ca731edcf38725051 (diff)
downloadQt-4942e2834c1da00bfceec6430ce351888efc1976.zip
Qt-4942e2834c1da00bfceec6430ce351888efc1976.tar.gz
Qt-4942e2834c1da00bfceec6430ce351888efc1976.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'qmake')
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 5f250bf..9759e7d 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1261,7 +1261,13 @@ void VcprojGenerator::initDeploymentTool()
searchPath = info.absoluteFilePath();
} else {
nameFilter = source.split('\\').last();
- searchPath = info.absolutePath();
+ if (source.contains('*')) {
+ source = source.split('*').first();
+ info = QFileInfo(source);
+ }
+ searchPath = info.absolutePath();
+ if (!info.exists())
+ fprintf(stderr, "Deployment file is missing %s\n", source.toLatin1().constData());
}
int pathSize = searchPath.size();