jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_gui-qt4: silence compile warning + wpsTab enable/disable

Browse source 
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>
This commit is contained in:
Kel Modderman 2009-01-11 21:44:07 +02:00 committed by Jouni Malinen
parent 3904625396
commit e0f6d3d9b5
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wpa_supplicant/wpa_gui-qt4/wpagui.cpp
View file

@ -407,6 +407,7 @@ int WpaGui::openCtrlConnection(const char *ifname)
QString res(buf); QString res(buf);
QStringList types = res.split(QChar(' ')); QStringList types = res.split(QChar(' '));
actionWPS->setEnabled(types.contains("WSC")); actionWPS->setEnabled(types.contains("WSC"));
wpsTab->setEnabled(types.contains("WSC"));
} }
return 0; return 0;

2
wpa_supplicant/wpa_gui-qt4/wpagui.ui
View file

@ -293,7 +293,7 @@
<attribute name="title" > <attribute name="title" >
<string>WPS</string> <string>WPS</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout" > <layout class="QGridLayout" name="wpsGridLayout" >
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="label_2" > <widget class="QLabel" name="label_2" >
<property name="text" > <property name="text" >