|
|
@ -58,6 +58,7 @@ int qtDetected = 0; |
|
|
|
bool qtDetectionComplete = 0; // As long as Qt is not detected yet, ldd may encounter "not found" messages, continue anyway
|
|
|
|
bool deployLibrary = false; |
|
|
|
QStringList extraQtPlugins; |
|
|
|
QStringList excludeLibs; |
|
|
|
bool copyCopyrightFiles = true; |
|
|
|
|
|
|
|
using std::cout; |
|
|
@ -478,6 +479,7 @@ LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, |
|
|
|
#else |
|
|
|
excludelist << EXCLUDELIST; |
|
|
|
#endif |
|
|
|
excludelist += excludeLibs; |
|
|
|
|
|
|
|
LogDebug() << "excludelist:" << excludelist; |
|
|
|
if (! trimmed.contains("libicu")) { |
|
|
@ -671,6 +673,8 @@ QList<LibraryInfo> getQtLibrariesForPaths(const QStringList &paths, const QStrin |
|
|
|
QSet<QString> existing; |
|
|
|
|
|
|
|
foreach (const QString &path, paths) { |
|
|
|
if (!excludeLibs.contains(QFileInfo(path).baseName())) |
|
|
|
{ |
|
|
|
foreach (const LibraryInfo &info, getQtLibraries(path, appDirPath, rpaths)) { |
|
|
|
if (!existing.contains(info.libraryPath)) { // avoid duplicates
|
|
|
|
existing.insert(info.libraryPath); |
|
|
@ -678,6 +682,7 @@ QList<LibraryInfo> getQtLibrariesForPaths(const QStringList &paths, const QStrin |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return result; |
|
|
|
} |
|
|
|
|
|
|
@ -1399,6 +1404,8 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath |
|
|
|
foreach (const QString &plugin, pluginList) { |
|
|
|
sourcePath = pluginSourcePath + "/" + plugin; |
|
|
|
destinationPath = pluginDestinationPath + "/" + plugin; |
|
|
|
if(!excludeLibs.contains(QFileInfo(sourcePath).baseName())) |
|
|
|
{ |
|
|
|
QDir dir; |
|
|
|
dir.mkpath(QFileInfo(destinationPath).path()); |
|
|
|
QList<LibraryInfo> libraries = getQtLibraries(sourcePath, appDirInfo.path, deploymentInfo.rpathsUsed); |
|
|
@ -1417,6 +1424,7 @@ void deployPlugins(const AppDirInfo &appDirInfo, const QString &pluginSourcePath |
|
|
|
LogDebug() << "copyCopyrightFile:" << sourcePath; |
|
|
|
copyCopyrightFile(sourcePath); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
void createQtConf(const QString &appDirPath) |
|
|
|