diff options
author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-10-01 04:42:27 (GMT) |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2009-10-01 04:43:42 (GMT) |
commit | 5da322990a5002d8c827578efad7b210716f1c15 (patch) | |
tree | 04aab593f8f0047095d0957849a42e3c31ad48ba /qmake | |
parent | 9dc9084a2ede875495e078e6998476f2ae5ea4e5 (diff) | |
download | Qt-5da322990a5002d8c827578efad7b210716f1c15.zip Qt-5da322990a5002d8c827578efad7b210716f1c15.tar.gz Qt-5da322990a5002d8c827578efad7b210716f1c15.tar.bz2 |
Revert "qmake - add error message if files for deployment are missing"
This reverts commit aed3faca7dafdc697402cfc99dc5e9ad2fcbdd45.
Using wildcards in the DEPLOYMENT variable like in
tests/auto/qpixmap/qpixmap.pro was completely broken.
Additional gimmick: replaced hand-crafted string chopping with
QString::chop(1).
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 0fedbec..c8bb26d 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1172,7 +1172,7 @@ void VcprojGenerator::initDeploymentTool() if (targetPath.isEmpty()) targetPath = QString("%CSIDL_PROGRAM_FILES%\\") + project->first("TARGET"); if (targetPath.endsWith("/") || targetPath.endsWith("\\")) - targetPath = targetPath.mid(0,targetPath.size()-1); + targetPath.chop(1); // Only deploy Qt libs for shared build if (!project->values("QMAKE_QT_DLL").isEmpty()) { @@ -1261,13 +1261,7 @@ void VcprojGenerator::initDeploymentTool() searchPath = info.absoluteFilePath(); } else { nameFilter = source.split('\\').last(); - 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()); + searchPath = info.absolutePath(); } int pathSize = searchPath.size(); |