diff options
Diffstat (limited to 'qmake/generators/win32/msvc_vcproj.cpp')
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 7d32dab..f2268aa 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1261,8 +1261,8 @@ void VcprojGenerator::initDeploymentTool() searchPath = info.absoluteFilePath(); } else { nameFilter = source.split('\\').last(); - if (source.contains('*')) { - source = source.split('*').first(); + if (source.contains('*')) { + source = source.split('*').first(); info = QFileInfo(source); } searchPath = info.absolutePath(); @@ -1424,20 +1424,6 @@ void VcprojGenerator::initResourceFiles() dep_cmd = Option::fixPathToLocalOS(dep_cmd, true, false); if(canExecute(dep_cmd)) { -#if defined(Q_CC_MWERKS) && defined(Q_OS_WIN32) - QPopen procPipe; - if( procPipe.init(dep_cmd.toLatin1().constData(), "r") ) { - QString indeps; - while(true) { - int read_in = procPipe.fread(buff, 255); - if ( !read_in ) - break; - indeps += QByteArray(buff, read_in); - } - if(!indeps.isEmpty()) - deps += fileFixify(indeps.replace('\n', ' ').simplified().split(' ')); - } -#else if(FILE *proc = QT_POPEN(dep_cmd.toLatin1().constData(), "r")) { QString indeps; while(!feof(proc)) { @@ -1450,7 +1436,6 @@ void VcprojGenerator::initResourceFiles() if(!indeps.isEmpty()) deps += fileFixify(indeps.replace('\n', ' ').simplified().split(' ')); } -#endif } } vcProject.ResourceFiles.addFiles(deps); |