diff options
| author | Kel Modderman <kel@otaku42.de> | 2009-01-11 21:44:07 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2009-01-11 21:44:07 +0200 |
| commit | e0f6d3d9b546a82f4af50a3481d8f9cdb951f47d (patch) | |
| tree | 3fa4581b250664f56656fb8a77a9350e4226afca /wpa_supplicant/wpa_gui-qt4 | |
| parent | 3904625396dcccd52e7090388564e87cc271af0f (diff) | |
| download | external_wpa_supplicant_8_ti-e0f6d3d9b546a82f4af50a3481d8f9cdb951f47d.zip external_wpa_supplicant_8_ti-e0f6d3d9b546a82f4af50a3481d8f9cdb951f47d.tar.gz external_wpa_supplicant_8_ti-e0f6d3d9b546a82f4af50a3481d8f9cdb951f47d.tar.bz2 | |
wpa_gui-qt4: silence compile warning + wpsTab enable/disable
Fix compile warning by renaming gridLayout to wpsGridLayout in
wpagui.ui, it seems to be used internally.
/usr/bin/uic-qt4 eventhistory.ui -o .ui/ui_eventhistory.h
/usr/bin/uic-qt4 scanresults.ui -o .ui/ui_scanresults.h
/usr/bin/uic-qt4 wpagui.ui -o .ui/ui_wpagui.h
Warning: name gridLayout is already used
/usr/bin/uic-qt4 userdatarequest.ui -o .ui/ui_userdatarequest.h
/usr/bin/uic-qt4 networkconfig.ui -o .ui/ui_networkconfig.h
Also disable WPS tab if the running supplicant doesn't support that,
just as the WPS action menu is.
Signed-off-by: Kel Modderman <kel@otaku42.de>
Diffstat (limited to 'wpa_supplicant/wpa_gui-qt4')
| -rw-r--r-- | wpa_supplicant/wpa_gui-qt4/wpagui.cpp | 1 | ||||
| -rw-r--r-- | wpa_supplicant/wpa_gui-qt4/wpagui.ui | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp index c993a85..3efdccb 100644 --- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp @@ -407,6 +407,7 @@ int WpaGui::openCtrlConnection(const char *ifname) QString res(buf); QStringList types = res.split(QChar(' ')); actionWPS->setEnabled(types.contains("WSC")); + wpsTab->setEnabled(types.contains("WSC")); } return 0; diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.ui b/wpa_supplicant/wpa_gui-qt4/wpagui.ui index 77a931b..cd67ecb 100644 --- a/wpa_supplicant/wpa_gui-qt4/wpagui.ui +++ b/wpa_supplicant/wpa_gui-qt4/wpagui.ui @@ -293,7 +293,7 @@ <attribute name="title" > <string>WPS</string> </attribute> - <layout class="QGridLayout" name="gridLayout" > + <layout class="QGridLayout" name="wpsGridLayout" > <item row="0" column="0" > <widget class="QLabel" name="label_2" > <property name="text" > |