From 0ef9bd9e2399801e1e9098ecec841a5cee44b7ac Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 4 Jan 2016 11:54:11 +0100 Subject: [PATCH] Remove bearer plugins Causes regressions due to constant Wifi scanning --- admin/osx/macdeployqt.py | 2 -- cmake/modules/NSIS.template.in | 5 ----- 2 files changed, 7 deletions(-) diff --git a/admin/osx/macdeployqt.py b/admin/osx/macdeployqt.py index 78bc36013..60ff4b93a 100755 --- a/admin/osx/macdeployqt.py +++ b/admin/osx/macdeployqt.py @@ -38,8 +38,6 @@ QT_PLUGINS = [ 'imageformats/libqgif.dylib', 'imageformats/libqico.dylib', 'imageformats/libqjpeg.dylib', - 'bearer/libqcorewlanbearer.dylib', - 'bearer/libqgenericbearer.dylib', 'imageformats/libqsvg.dylib', 'imageformats/libqmng.dylib', ] diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 8bd8e7968..98d5a3df6 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -40,7 +40,6 @@ !define QT_DLL_PATH "${MING_BIN}" !define ACCESSIBLE_DLL_PATH "${MING_LIB}/qt5/plugins/accessible" !define SQLITE_DLL_PATH "${MING_LIB}/qt5/plugins/sqldrivers" -!define BEARER_DLL_PATH "${MING_LIB}/qt5/plugins/bearer" !define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt5/plugins/imageformats" !define PLATFORMS_DLL_PATH "${MING_LIB}/qt5/plugins/platforms" @@ -407,10 +406,6 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION SetOutPath "$INSTDIR\sqldrivers" File "${SQLITE_DLL_PATH}\qsqlite.dll" - SetOutPath "$INSTDIR\bearer" - File "${BEARER_DLL_PATH}\qgenericbearer.dll" - File "${BEARER_DLL_PATH}\qnativewifibearer.dll" - SetOutPath "$INSTDIR" ;License & release notes. File "@CPACK_RESOURCE_FILE_LICENSE@" -- 2.30.2