Merge pull request #249 from probonopd/TheAssassin/issue-231

Add flag to disable copyright files deployment

tools/linuxdeployqt/main.cpp

@@ -79,6 +79,7 @@ int main(int argc, char **argv)
         qInfo() << "   -always-overwrite        : Copy files even if the target file exists";
         qInfo() << "   -qmake=<path>            : The qmake executable to use";
         qInfo() << "   -no-translations         : Skip deployment of translations.";
+        qInfo() << "   -no-copy-copyright-files : Skip deployment of copyright files.";
         qInfo() << "   -extra-plugins=<list>    : List of extra plugins which should be deployed,";
         qInfo() << "                              separated by comma.";
         qInfo() << "   -version                 : Print version statement and exit.";
@@ -206,6 +207,7 @@ int main(int argc, char **argv)
     QStringList qmlDirs;
     QString qmakeExecutable;
     extern QStringList extraQtPlugins;
+    extern bool copyCopyrightFiles;
 
     /* FHS-like mode is for an application that has been installed to a $PREFIX which is otherwise empty, e.g., /path/to/usr.
      * In this case, we want to construct an AppDir in /path/to. */
@@ -397,6 +399,9 @@ int main(int argc, char **argv)
                 LogError() << "Missing qml directory path";
             else
                 qmlDirs << argument.mid(index+1);
+        } else if (argument.startsWith("-no-copy-copyright-files")) {
+            LogDebug() << "Argument found:" << argument;
+            copyCopyrightFiles = false;
         } else if (argument == QByteArray("-always-overwrite")) {
             LogDebug() << "Argument found:" << argument;
             alwaysOwerwriteEnabled = true;

tools/linuxdeployqt/shared.cpp

@@ -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;
+bool copyCopyrightFiles = true;
 
 using std::cout;
 using std::endl;
@@ -284,6 +285,11 @@ bool copyCopyrightFile(QString libPath){
      * Debian-like systems. Pull requests welcome for other
      * systems. */
 
+    if (!copyCopyrightFiles) {
+        LogNormal() << "Skipping copyright files deployment as requested by the user";
+        return false;
+    }
+
     QString dpkgPath;
     dpkgPath = QStandardPaths::findExecutable("dpkg");
     if(dpkgPath == ""){