diff options
| author | sam <sam@FreeBSD.org> | 2008-03-24 19:46:53 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2008-03-24 19:46:53 +0000 |
| commit | 153f9c1cd9a5b749f57e28682fadb39c781e1e5d (patch) | |
| tree | f77bae77287d18eaa89acc25e38b5acccca132fe /contrib/wpa_supplicant/wpa_gui | |
| parent | 35aef052ff21baa52c4cec68b512986c21f70a48 (diff) | |
| download | FreeBSD-src-153f9c1cd9a5b749f57e28682fadb39c781e1e5d.zip FreeBSD-src-153f9c1cd9a5b749f57e28682fadb39c781e1e5d.tar.gz | |
Import of WPA supplicant 0.5.10
Diffstat (limited to 'contrib/wpa_supplicant/wpa_gui')
| -rw-r--r-- | contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h | 2 | ||||
| -rwxr-xr-x | contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling | 6 | ||||
| -rw-r--r-- | contrib/wpa_supplicant/wpa_gui/wpagui.ui.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h b/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h index 49bc722..a3cd733 100644 --- a/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h +++ b/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h @@ -131,7 +131,7 @@ void NetworkConfig::addNetwork() setNetworkParam(id, "ssid", ssidEdit->text().ascii(), true); - char *key_mgmt = NULL, *proto = NULL, *pairwise = NULL; + const char *key_mgmt = NULL, *proto = NULL, *pairwise = NULL; switch (auth) { case AUTH_NONE: key_mgmt = "NONE"; diff --git a/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling b/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling index e173b00..07e4a8f 100755 --- a/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling +++ b/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling @@ -4,8 +4,8 @@ # and I have no idea how to change these. For now, just override the # directories in the Makefile.Release file after qmake run. -qmake -spec /q/jm/qt4-win/4.0.0/mkspecs/win32-g++ wpa_gui.pro -o Makefile +qmake -spec /q/jm/qt4-win/4.3.3/mkspecs/win32-g++ wpa_gui.pro -o Makefile cat Makefile.Release | - sed s%qt4/lib%qt4-win/4.0.0/lib%g | - sed s%qt4/include%qt4-win/4.0.0/include%g > tmp.Makefile.Release && + sed s%/usr/lib/qt4%/q/jm/qt4-win/4.3.3/lib%g | + sed s%/usr/include/qt4%/q/jm/qt4-win/4.3.3/include%g > tmp.Makefile.Release && mv -f tmp.Makefile.Release Makefile.Release diff --git a/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h b/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h index 04e438d..6db8862 100644 --- a/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h +++ b/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h @@ -468,7 +468,7 @@ void WpaGui::helpContents() void WpaGui::helpAbout() { QMessageBox::about(this, "wpa_gui for wpa_supplicant", - "Copyright (c) 2003-2005,\n" + "Copyright (c) 2003-2008,\n" "Jouni Malinen <j@w1.fi>\n" "and contributors.\n" "\n" |
