diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-03 14:47:57 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-03 14:48:39 +0300 |
commit | f9a7453281699078d45ce7a06835898b7e2cf5c5 (patch) | |
tree | 2346511cd7f277ff7f0e60b40a6c4fb8f75caf2d /src/networksettings/wpasupplicant.pri | |
parent | b74fef2d502e6b11520622594021ba8950f5f8c6 (diff) | |
parent | e9ac06074db9804fc5d717bcc4ae503b70616fe7 (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
* origin/5.13:
e9ac060 Merge remote-tracking branch 'origin/5.12' into 5.13
330b6f0 Drop wpa_supplicant from NetworkSettings
Change-Id: Ife4f027f5ba08d03affa06b0e4cdfa26251d2580
Diffstat (limited to 'src/networksettings/wpasupplicant.pri')
-rw-r--r-- | src/networksettings/wpasupplicant.pri | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/networksettings/wpasupplicant.pri b/src/networksettings/wpasupplicant.pri deleted file mode 100644 index db89315..0000000 --- a/src/networksettings/wpasupplicant.pri +++ /dev/null @@ -1,28 +0,0 @@ -QT += core network - -INCLUDEPATH += $${PWD}/wpasupplicant - -HEADERS += \ - $$PWD/wpasupplicant/qnetworksettingsinterface_p.h \ - $$PWD/wpasupplicant/qnetworksettingsmanager_p.h \ - $$PWD/wpasupplicant/qwifisupplicant_p.h \ - $$PWD/wpasupplicant/qwificontroller_p.h \ - $$PWD/wpasupplicant/qnetworksettingsservice_p.h \ - $$PWD/wpasupplicant/qnetworksettingsuseragent_p.h \ - $$PWD/wpasupplicant/qwifidevice.h - -SOURCES += \ - $$PWD/wpasupplicant/qnetworksettingsinterface_p.cpp \ - $$PWD/wpasupplicant/qnetworksettingsmanager_p.cpp \ - $$[QT_SYSROOT]/usr/include/wpa-supplicant/wpa_ctrl.c \ - $$[QT_SYSROOT]/usr/include/wpa-supplicant/os_unix.c \ - $$PWD/wpasupplicant/qwifisupplicant.cpp \ - $$PWD/wpasupplicant/qwificontroller.cpp \ - $$PWD/wpasupplicant/qnetworksettingsservice_p.cpp \ - $$PWD/wpasupplicant/qnetworksettingsuseragent_p.cpp \ - $$PWD/wpasupplicant/qwifidevice.cpp - -DEFINES += \ - CONFIG_CTRL_IFACE \ - CONFIG_CTRL_IFACE_UNIX - |