diff options
| author | Chris Adams <chris.adams@qinetic.com.au> | 2018-07-13 12:56:15 +1000 |
|---|---|---|
| committer | Christopher Adams <chris.adams@jollamobile.com> | 2018-07-19 01:03:24 +0000 |
| commit | 7e2579c1fbfc077f3d95eceed5c79236752acb87 (patch) | |
| tree | 515fa7c023ccb231c5cdd6dd1e9a3c1e2544eff7 | |
| parent | 1fe0847301c7d4d1cf95b47f6d3383f24100ac61 (diff) | |
Fix bundled zlib detection
Change-Id: Id53affc9987626ffb3df043ac5619dddbf3b2342
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
| -rw-r--r-- | src/plugins/messageservices/imap/imap.pro | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/plugins/messageservices/imap/imap.pro b/src/plugins/messageservices/imap/imap.pro index 8e5362ec..263df59e 100644 --- a/src/plugins/messageservices/imap/imap.pro +++ b/src/plugins/messageservices/imap/imap.pro @@ -46,17 +46,9 @@ SOURCES += \ RESOURCES += imap.qrc } -!contains(QT_CONFIG, system-zlib) { - INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib - DEFINES += QT_QMF_HAVE_ZLIB -} else:packagesExist(zlib) { - CONFIG += link_pkgconfig - PKGCONFIG += zlib - DEFINES += QT_QMF_HAVE_ZLIB -} else:macx:exists("/usr/include/zlib.h") { - LIBS += -lz - DEFINES += QT_QMF_HAVE_ZLIB +qtConfig(system-zlib) { + QMAKE_USE_PRIVATE += zlib } else { - warning("IMAP COMPRESS capability requires zlib") + QT_PRIVATE += zlib-private } |