diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-16 09:38:20 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-16 09:38:20 +0300 |
| commit | 83efd639f995fae2d0614a8f98205069eb5a58ee (patch) | |
| tree | 298111e0c7846e08d48cf50f3533696d7330d4f7 /src/imports/wifi/wifi.pro | |
| parent | 4c6c06470f4998506d59de0a6488f40d50ca4154 (diff) | |
| parent | cef8834b27a7588886c0439d145004ae9ad33a13 (diff) | |
Merge branch 'stable' into dev
* stable: (22 commits)
Add note about headphones on eAndroid
Doc: Relocate unmount instructions
Doc: Add ChangeLog for Qt Enterprise Embedded 2.1.0
Doc: Disable code highlighting for command-line instructions
doc: update version number to 2.1.0
[Wifi] Add new enums and make some API changes
Doc: Add documentation on custom build & deploy steps
Doc: Create QML Type reference page
Doc: Add information about licenses in embedded Linux images
Doc: Improve instructions for deploying existing projects
Doc: Separate Building Your Own Linux Image into its own page
doc: use same directory for yocto and qt
doc: config.<MACHINE> needed only once
doc: guide for imx53 and how to setup QtCreator
Doc: Be more precise on screen content for Nexus7
Add documentation to QtWifi library
Doc: Add note for users to not use root for installation
doc: describe how to use network connection for adb
Rename misleading class name
Remove unnecessary roles from QWifiNetworkList
...
Conflicts:
src/imports/wifi/qwifimanager.cpp
Change-Id: Ie7efa2ec91ac154f1e984600f569d9c7f8383627
Diffstat (limited to 'src/imports/wifi/wifi.pro')
| -rw-r--r-- | src/imports/wifi/wifi.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/wifi/wifi.pro b/src/imports/wifi/wifi.pro index 0231479..b920978 100644 --- a/src/imports/wifi/wifi.pro +++ b/src/imports/wifi/wifi.pro @@ -8,12 +8,12 @@ SOURCES += \ pluginmain.cpp \ qwifimanager.cpp \ qwifinetwork.cpp \ - qwifinetworklist.cpp + qwifinetworklistmodel.cpp HEADERS += \ qwifimanager.h \ qwifinetwork.h \ - qwifinetworklist.h + qwifinetworklistmodel.h LIBS += -lhardware_legacy -lcutils |