summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-08-17 15:32:35 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-08-17 14:37:48 +0000
commit8cb396e010d111a65e1250bc441d57f0c57ddb96 (patch)
tree675768c0ca3488cde4eda0af659837850377198b
parentd72b098be95a3c992c8d4cc924f24e6aebcd5294 (diff)
downloadqttools-8cb396e010d111a65e1250bc441d57f0c57ddb96.tar.gz
qttools-8cb396e010d111a65e1250bc441d57f0c57ddb96.tar.bz2
qttools-8cb396e010d111a65e1250bc441d57f0c57ddb96.zip
windeployqt: Fix handling of the --no-webkit2 option.
The option formerly was a boolean value and one if-statement was overlooked when changing it into an enumeration value of type ExlusiveOptionValue. Task-number: QTBUG-47785 Change-Id: I6135a6268221841025fd05928cea50ffa6fbdea9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-rw-r--r--src/windeployqt/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
index e5a1f0b6..a728e4c3 100644
--- a/src/windeployqt/main.cpp
+++ b/src/windeployqt/main.cpp
@@ -1447,7 +1447,7 @@ int main(int argc, char **argv)
return 1;
}
- if (optWebKit2)
+ if (optWebKit2 == OptionEnabled)
options.additionalLibraries |= QtWebKitModule;