summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2016-01-27 13:57:56 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-27 19:32:31 +0000
commit2d3a5c7a4e78cdbd973416ea8fdaea6e2fb4ddb7 (patch)
tree781f10306c235855925d9b4895e2f2cde25c3273 /src
parent0f66e27e61c32d7447cbd463ec15ee8d950e58cb (diff)
Remove superfluous enable_plugins=1
chromium/build/common.gypi already sets enable_plugins to true by default for desktop platforms. Change-Id: I3805a6856fe70ad3bd89606e974b02858e68e263 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/config/desktop_linux.pri1
-rw-r--r--src/core/config/mac_osx.pri1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/core/config/desktop_linux.pri b/src/core/config/desktop_linux.pri
index 7e1d9b106..a78082581 100644
--- a/src/core/config/desktop_linux.pri
+++ b/src/core/config/desktop_linux.pri
@@ -4,7 +4,6 @@ include(linux.pri)
GYP_CONFIG += \
desktop_linux=1 \
- enable_plugins=1 \
enable_widevine=1
linux-clang: GYP_CONFIG += clang=1 host_clang=1 clang_use_chrome_plugins=0 make_clang_dir=/usr
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index b1659985e..6532077de 100644
--- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri
@@ -15,7 +15,6 @@ GYP_CONFIG += \
mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
make_clang_dir=\"$${QMAKE_CLANG_DIR}\" \
clang_use_chrome_plugins=0 \
- enable_plugins=1 \
enable_widevine=1
QMAKE_MAC_SDK_PATH = "$$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.path)"