From e806630f4b715e91541391710f8489188c0a0655 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Thu, 6 Sep 2012 13:42:29 +0300 Subject: Fix filter list handling in qtpatchoperation.cpp Fix a bug in filter handling. If no filters were given it caused all files to be included which was not the original intention. Added a check if no filters given then do not even try to search files by type. Change-Id: I2ceb83611c1c9a4a9f8bf58da0673c963dd4ae0c Reviewed-by: Iikka Eklund Reviewed-by: Niels Weber Reviewed-by: Tim Jenssen --- src/libs/installer/qtpatchoperation.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index cec0b84ed..4941a00c3 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -315,10 +315,12 @@ bool QtPatchOperation::performOperation() #endif // get file list defined by filters and patch them - QStringList filteredContent = getDirContent(prefix, filters); - foreach (QString fileName, filteredContent) { - if (QFile::exists(fileName)) { - QtPatch::patchTextFile(fileName, searchReplacePairs); + if (filters.count() > 0) { + const QStringList filteredContent = getDirContent(prefix, filters); + foreach (const QString &fileName, filteredContent) { + if (QFile::exists(fileName)) { + QtPatch::patchTextFile(fileName, searchReplacePairs); + } } } -- cgit v1.2.3