diff options
| author | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-10-12 13:41:19 +0200 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-10-12 11:45:55 +0000 |
| commit | 5cf7d25e40220bd96799406293d1267532721712 (patch) | |
| tree | 021218051614b5beaa3ae2728317751f8b3c3e24 /tools | |
| parent | effa889ba7b7a10b3648a9ded55a5bcd4bae993a (diff) | |
Remove hard dependency on libjpeg on Linux.
It made the build fail on systems that use libjpeg-turbo.
Task-number: QTBUG-48606
Change-Id: I1aa6acab1627d3f4613b4ca39837b6deb25d3cc0
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/configure.prf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf index 321e67e92..8c6876857 100644 --- a/tools/qmake/mkspecs/features/configure.prf +++ b/tools/qmake/mkspecs/features/configure.prf @@ -29,7 +29,6 @@ defineTest(runConfigure) { contains(QT_CONFIG, xcb): REQUIRED_PACKAGES += libdrm xcomposite xcursor xi xrandr xscrnsaver xtst contains(QT_CONFIG, pulseaudio): REQUIRED_PACKAGES += libpulse contains(QT_CONFIG, system-png): REQUIRED_PACKAGES += libpng - contains(QT_CONFIG, system-jpeg): REQUIRED_PACKAGES += libjpeg contains(QT_CONFIG, system-harfbuzz): REQUIRED_PACKAGES += harfbuzz !cross_compile: REQUIRED_PACKAGES += libpci nss |