summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Hartmann <Thomas.Hartmann@nokia.com>2009-08-07 07:29:56 (GMT)
committerThomas Hartmann <Thomas.Hartmann@nokia.com>2009-08-07 07:33:41 (GMT)
commitaed3faca7dafdc697402cfc99dc5e9ad2fcbdd45 (patch)
tree83386aaff19d064186f69aec8f2902a084f31083
parent592462f4101bb2a9d7be58fb72b8f11714490cd5 (diff)
downloadQt-aed3faca7dafdc697402cfc99dc5e9ad2fcbdd45.zip
Qt-aed3faca7dafdc697402cfc99dc5e9ad2fcbdd45.tar.gz
Qt-aed3faca7dafdc697402cfc99dc5e9ad2fcbdd45.tar.bz2
qmake - add error message if files for deployment are missing
If files for deployment for windows ce are missing we get an error message now. Wilcards have to behandled special because QFileInfo::exists() does not work with wildcards. QFileInfo::absoluteFilePath() does work with wildcards Reviewed-by: Mauricek
-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();