diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-01 10:27:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-02 09:24:11 +0100 |
| commit | d7e4980132057aa10e54137114bf65e06c455030 (patch) | |
| tree | 9d6ae36efa0cf84a612bfec6cf3dd2ea7f7e3446 /src/network/ssl | |
| parent | 44c402b4bfba44480382244b8409fb3cf34d7ac1 (diff) | |
| parent | a732576a66ff2bbd9c0b41cd5f3505a4d2fbf043 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS.
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/mac/sdk.prf
mkspecs/features/uikit/default_post.prf
mkspecs/features/uikit/sdk.prf
src/angle/src/libEGL/libEGL.pro
src/platformsupport/fontdatabases/fontdatabases.pro
src/platformsupport/platformsupport.pro
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp
src/plugins/platforms/ios/ios.pro
src/plugins/platforms/ios/kernel.pro
tests/auto/widgets/widgets/qmenubar/BLACKLIST
tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
Task-number: QTBUG-56853
Change-Id: If58785210feee3550892fc7768cce90e75a2416c
Diffstat (limited to 'src/network/ssl')
| -rw-r--r-- | src/network/ssl/ssl.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index 8139af50af..79351017a6 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -79,6 +79,8 @@ qtConfig(ssl) { # - libs in <OPENSSL_DIR>\lib\VC\static # - configure: -openssl -openssl-linked -I <OPENSSL_DIR>\include -L <OPENSSL_DIR>\lib\VC\static OPENSSL_LIBS="-lUser32 -lAdvapi32 -lGdi32" OPENSSL_LIBS_DEBUG="-lssleay32MDd -llibeay32MDd" OPENSSL_LIBS_RELEASE="-lssleay32MD -llibeay32MD" + include($$OUT_PWD/qtnetwork-config.pri) + CONFIG(debug, debug|release) { LIBS_PRIVATE += $$OPENSSL_LIBS_DEBUG } else { |