summaryrefslogtreecommitdiff
path: root/WebKit.pro
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-10 13:08:05 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-10 13:08:05 +0200
commit81cbb264cb9446c4408124d50aeff50164ad0ab4 (patch)
tree6acc39b8ea0165562d480f1c54608c6c4ae9f865 /WebKit.pro
parentbeaeeb99881184fd368c121fcbb1a31c78b794a3 (diff)
parent5087e0ced43d813eb6f765913a6fc3958d2a7a9d (diff)
downloadqtwebkit-81cbb264cb9446c4408124d50aeff50164ad0ab4.tar.gz
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I4e185b15690118515df80a79b786cbb8b30dd144
Diffstat (limited to 'WebKit.pro')
-rw-r--r--WebKit.pro3
1 files changed, 0 insertions, 3 deletions
diff --git a/WebKit.pro b/WebKit.pro
index ca3b009aa..09debf182 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -9,9 +9,6 @@ isPlatformSupported() {
!qtConfig(system-png):qtConfig(png):exists($$QTBASE_DIR): \
SUBDIRS += $$PROJECTS_DIR/qtpng
- !qtConfig(system-jpeg):exists($$QTBASE_DIR): \
- SUBDIRS += $$PROJECTS_DIR/qtjpeg
-
SUBDIRS += \
$$PROJECTS_DIR/generate_cmake_toolchain_file.pro \
$$PROJECTS_DIR/generate_forwarding_pris.pro \