diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-12-29 15:56:33 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-12-30 12:09:53 +0100 |
| commit | db92f2f3aac60218756a1aa8811cf192acc0b0e6 (patch) | |
| tree | f28a47aebb2f08e221fe7bffafce62a0a96cf7fd /src/network/configure.json | |
| parent | dd61a1d98ea9fbffeaf0e2adcd0ddd58105f6a75 (diff) | |
| parent | 44da5b863597e761df3545dc7ff02a9b53bbb13d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
mkspecs/win32-g++/qmake.conf
src/corelib/global/qglobal_p.h
src/corelib/global/qoperatingsystemversion_p.h
src/corelib/io/qfilesystemengine_win.cpp
src/network/bearer/qbearerengine.cpp
src/platformsupport/input/libinput/qlibinputpointer.cpp
src/sql/doc/snippets/code/doc_src_sql-driver.cpp
src/widgets/kernel/qwidget_p.h
src/widgets/kernel/qwidgetwindow.cpp
src/widgets/styles/qfusionstyle.cpp
tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8
Diffstat (limited to 'src/network/configure.json')
| -rw-r--r-- | src/network/configure.json | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/network/configure.json b/src/network/configure.json index d46fbfc101..770921f9a6 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -69,18 +69,10 @@ { "comment": "placeholder for OPENSSL_{PATH,LIBS{,_{DEBUG,RELEASE}}}", "libs": "", - "builds": { - "debug": "", - "release": "" - }, "condition": "config.win32 && !features.shared" }, { "libs": "-lssleay32 -llibeay32", - "builds": { - "debug": "", - "release": "" - }, "condition": "config.win32 && features.shared" }, { "libs": "-lssl -lcrypto", "condition": "!config.win32" } |