From ac1af7d6acdb4bad85cc7a3a42a5a1cb4d407875 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Mon, 27 Jul 2015 09:49:11 +0200
Subject: windeployqt: Add option to suppress deployment of the software
 rasterizer.

Add command line option --no-opengl-sw to suppress deployment of
opengl32sw.dll.

Task-number: QTBUG-47449
Change-Id: I2bf9aab98c9b56e62640da3fa13052ccc5f163d8
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
 src/windeployqt/main.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index f2831485..377248fa 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -248,8 +248,10 @@ struct Options {
         AngleDetectionForceOff
     };
 
-    Options() : plugins(true), libraries(true), quickImports(true), translations(true), systemD3dCompiler(true), compilerRunTime(false)
-              , angleDetection(AngleDetectionAuto), platform(Windows), additionalLibraries(0), disabledLibraries(0)
+    Options() : plugins(true), libraries(true), quickImports(true), translations(true)
+              , systemD3dCompiler(true), compilerRunTime(false)
+              , angleDetection(AngleDetectionAuto), softwareRasterizer(true), platform(Windows)
+              , additionalLibraries(0), disabledLibraries(0)
               , updateFileFlags(0), json(0), list(ListNone), debugDetection(DebugDetectionAuto)
               , debugMatchAll(false) {}
 
@@ -260,6 +262,7 @@ struct Options {
     bool systemD3dCompiler;
     bool compilerRunTime;
     AngleDetection angleDetection;
+    bool softwareRasterizer;
     Platform platform;
     quint64 additionalLibraries;
     quint64 disabledLibraries;
@@ -400,6 +403,10 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
                                      QStringLiteral("Disable deployment of ANGLE."));
     parser->addOption(noAngleOption);
 
+    QCommandLineOption suppressSoftwareRasterizerOption(QStringLiteral("no-opengl-sw"),
+                                                        QStringLiteral("Do not deploy the software rasterizer library."));
+    parser->addOption(suppressSoftwareRasterizerOption);
+
     QCommandLineOption listOption(QStringLiteral("list"),
                                   QLatin1String("Print only the names of the files copied.\n"
                                                 "Available options:\n"
@@ -491,6 +498,9 @@ static inline int parseArguments(const QStringList &arguments, QCommandLineParse
         break;
     }
 
+    if (parser->isSet(suppressSoftwareRasterizerOption))
+        options->softwareRasterizer = false;
+
     optWebKit2 = parseExclusiveOptions(parser, webKitOption, noWebKitOption);
 
     if (parser->isSet(forceOption))
@@ -1231,7 +1241,7 @@ static DeployResult deploy(const Options &options,
                 }
             }
         } // deployAngle
-        if (!dependsOnOpenGl) {
+        if (options.softwareRasterizer && !dependsOnOpenGl) {
             const QFileInfo softwareRasterizer(qtBinDir + slash + QStringLiteral("opengl32sw") + QLatin1String(windowsSharedLibrarySuffix));
             if (softwareRasterizer.isFile())
                 deployedQtLibraries.append(softwareRasterizer.absoluteFilePath());
-- 
cgit v1.2.3