diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 00:55:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 00:56:28 +0100 |
| commit | 7c0824348f93947c946a42999afd8b5dd329c519 (patch) | |
| tree | c229349374005a214b904c5386fa578dc02a879b /Tools/qmake/config.tests/libzlib/libzlib.pro | |
| parent | dcf0d42f3de04c01ff6bfedf1a2ded863b134268 (diff) | |
| parent | 74ac5b0f3489f9a08d083b6c9607c9d5c2d4afd2 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: Iac71a5d02bdec7a00d17136048e6379c32c53d24
Diffstat (limited to 'Tools/qmake/config.tests/libzlib/libzlib.pro')
| -rw-r--r-- | Tools/qmake/config.tests/libzlib/libzlib.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Tools/qmake/config.tests/libzlib/libzlib.pro b/Tools/qmake/config.tests/libzlib/libzlib.pro index 2ffc15930..648e90ed0 100644 --- a/Tools/qmake/config.tests/libzlib/libzlib.pro +++ b/Tools/qmake/config.tests/libzlib/libzlib.pro @@ -6,5 +6,3 @@ else { isEmpty(ZLIB_LIBS): LIBS += zdll.lib else: LIBS += $$ZLIB_LIBS } - -load(qt_build_config) |