TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove empty lines from output

Browse Source
This commit is contained in:
probonopd
2016-09-06 00:15:40 +02:00
parent dd86b794ed
commit db2636d52f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shared/shared.cpp
+4 -4
View File
@@ -612,7 +612,7 @@ DeploymentInfo deployQtLibraries(QList<LibraryInfo> libraries,
const QString &bundlePath, const QStringList &binaryPaths, bool useDebugLibs, const QString &bundlePath, const QStringList &binaryPaths, bool useDebugLibs,
bool useLoaderPath) bool useLoaderPath)
{ {
LogNormal();
LogNormal() << "Deploying libraries found inside:" << binaryPaths; LogNormal() << "Deploying libraries found inside:" << binaryPaths;
QStringList copiedLibraries; QStringList copiedLibraries;
DeploymentInfo deploymentInfo; DeploymentInfo deploymentInfo;
@@ -695,7 +695,7 @@ DeploymentInfo deployQtLibraries(const QString &appDirPath, const QStringList &a
QList<LibraryInfo> libraries = getQtLibrariesForPaths(allBinaryPaths, appDirPath, allLibraryPaths, useDebugLibs); QList<LibraryInfo> libraries = getQtLibrariesForPaths(allBinaryPaths, appDirPath, allLibraryPaths, useDebugLibs);
if (libraries.isEmpty() && !alwaysOwerwriteEnabled) { if (libraries.isEmpty() && !alwaysOwerwriteEnabled) {
LogWarning();
LogWarning() << "Could not find any external Qt libraries to deploy in" << appDirPath; LogWarning() << "Could not find any external Qt libraries to deploy in" << appDirPath;
LogWarning() << "Perhaps linuxdeployqt was already used on" << appDirPath << "?"; LogWarning() << "Perhaps linuxdeployqt was already used on" << appDirPath << "?";
LogWarning() << "If so, you will need to rebuild" << appDirPath << "before trying again."; LogWarning() << "If so, you will need to rebuild" << appDirPath << "before trying again.";
@@ -791,7 +791,7 @@ void createQtConf(const QString &appDirPath)
QFile qtconf(fileName); QFile qtconf(fileName);
if (qtconf.exists() && !alwaysOwerwriteEnabled) { if (qtconf.exists() && !alwaysOwerwriteEnabled) {
LogWarning();
LogWarning() << fileName << "already exists, will not overwrite."; LogWarning() << fileName << "already exists, will not overwrite.";
LogWarning() << "To make sure the plugins are loaded from the correct location,"; LogWarning() << "To make sure the plugins are loaded from the correct location,";
LogWarning() << "please make sure qt.conf contains the following lines:"; LogWarning() << "please make sure qt.conf contains the following lines:";
@@ -971,7 +971,7 @@ void changeQtLibraries(const QString appPath, const QString &qtPath, bool useDeb
const QStringList libraryPaths = findAppLibraries(appPath); const QStringList libraryPaths = findAppLibraries(appPath);
const QList<LibraryInfo> libraries = getQtLibrariesForPaths(QStringList() << appBinaryPath << libraryPaths, appPath, getBinaryRPaths(appBinaryPath, true), useDebugLibs); const QList<LibraryInfo> libraries = getQtLibrariesForPaths(QStringList() << appBinaryPath << libraryPaths, appPath, getBinaryRPaths(appBinaryPath, true), useDebugLibs);
if (libraries.isEmpty()) { if (libraries.isEmpty()) {
LogWarning();
LogWarning() << "Could not find any _external_ Qt libraries to change in" << appPath; LogWarning() << "Could not find any _external_ Qt libraries to change in" << appPath;
return; return;
} else { } else {