diff options
| author | hjk <hjk@qt.io> | 2019-06-21 13:51:56 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-06-21 12:29:03 +0000 |
| commit | d57e052768929c50506f250441e89bddafb5d452 (patch) | |
| tree | 6277a8d65232c7f1673eb09121a2234784e82c9b /src/plugins/qnx | |
| parent | acf301fa13334bc8bbc078e00cddafe2b0eb7938 (diff) | |
Qnx: Do not deploy files that are not needed
Task-number: QTCREATORBUG-20000
Change-Id: Ie9a2341a3bcd1531bc83b54bf43466df1347627c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/qnx')
| -rw-r--r-- | src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp index 4263a1e498..aec85826a2 100644 --- a/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp +++ b/src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp @@ -256,6 +256,11 @@ QList<DeployableFile> QnxDeployQtLibrariesDialog::gatherFiles( if (dirPath.isEmpty()) return result; + static const QStringList unusedDirs = {"include", "mkspecs", "cmake", "pkgconfig"}; + const QString dp = dirPath.endsWith('/') ? dirPath.left(dirPath.size() - 1) : dirPath; + if (unusedDirs.contains(dp)) + return result; + QDir dir(dirPath); QFileInfoList list = dir.entryInfoList(nameFilters, QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot); @@ -265,6 +270,10 @@ QList<DeployableFile> QnxDeployQtLibrariesDialog::gatherFiles( result.append(gatherFiles(fileInfo.absoluteFilePath(), baseDirPath.isEmpty() ? dirPath : baseDirPath)); } else { + static const QStringList unusedSuffixes = {"cmake", "la", "prl", "a", "pc"}; + if (unusedSuffixes.contains(fileInfo.suffix())) + continue; + QString remoteDir; if (baseDirPath.isEmpty()) { remoteDir = fullRemoteDirectory() + QLatin1Char('/') + |