diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-11-10 18:40:04 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-11-17 20:22:17 +0000 |
| commit | ded63fbb94088c3b0fbbf9d3b3a421b2b934ab50 (patch) | |
| tree | 3b54afc34def97c796b4a40a8383fb2f356be8f7 /src | |
| parent | 3d3b4129cd197e9cb77cd59460749a38e91b087f (diff) | |
make a proper header-only module for QtZlib
that way other modules can use the headers without hacks.
this required making the base directory for paths in headers.pri
configurable in syncqt.
Change-Id: Id35cfe05bcf4c576d3f2d0d8d09590a5e23d21d3
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/qtzlib.pro | 7 | ||||
| -rw-r--r-- | src/corelib/tools/tools.pri | 4 | ||||
| -rw-r--r-- | src/src.pro | 4 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/src/corelib/qtzlib.pro b/src/corelib/qtzlib.pro new file mode 100644 index 0000000000..744750fbbe --- /dev/null +++ b/src/corelib/qtzlib.pro @@ -0,0 +1,7 @@ +TARGET = QtZlib +MODULE = zlib +MAKEFILE = Makefile.qtzlib +CONFIG += internal_module header_module alien_syncqt +QT = + +load(qt_module) diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index c43fd761d8..ed07f70e87 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -155,10 +155,6 @@ else:SOURCES += tools/qelapsedtimer_generic.cpp contains(QT_CONFIG, zlib) { include($$PWD/../../3rdparty/zlib.pri) - corelib_zlib_headers.files = $$PWD/../../3rdparty/zlib/zconf.h\ - $$PWD/../../3rdparty/zlib/zlib.h - corelib_zlib_headers.path = $$[QT_INSTALL_HEADERS]/QtZlib - INSTALLS += corelib_zlib_headers } else { include($$PWD/../../3rdparty/zlib_dependency.pri) } diff --git a/src/src.pro b/src/src.pro index a970391382..df5c85fa53 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,6 +2,9 @@ TEMPLATE = subdirs load(qfeatures) +src_qtzlib.file = $$PWD/corelib/qtzlib.pro +src_qtzlib.target = sub-zlib + src_tools_bootstrap.subdir = tools/bootstrap src_tools_bootstrap.target = sub-bootstrap src_tools_bootstrap.CONFIG = host_build @@ -125,6 +128,7 @@ src_plugins.depends = src_sql src_xml src_network src_android.subdir = $$PWD/android # this order is important +contains(QT_CONFIG, zlib)|cross_compile: SUBDIRS += src_qtzlib SUBDIRS += src_tools_bootstrap src_tools_moc src_tools_rcc !contains(QT_DISABLED_FEATURES, regularexpression):pcre { SUBDIRS += src_3rdparty_pcre diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index b6b16dcd3d..ca05f804a2 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -39,10 +39,7 @@ MODULE_PRIVATE_INCLUDES = \ # We need the forwarding headers before their respective modules are built, # so do a minimal syncqt run. CONFIG += minimal_syncqt -QMAKE_SYNCQT_OPTIONS = -module QtCore -module QtDBus -module QtXml -contains(QT_CONFIG, zlib): \ - QMAKE_SYNCQT_OPTIONS += -module QtZlib -QMAKE_SYNCQT_OPTIONS += -version $$QT_VERSION +QMAKE_SYNCQT_OPTIONS = -module QtCore -module QtDBus -module QtXml -version $$QT_VERSION load(qt_module) |