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

wpa_gui-qt4: Fix build with Session Manager disabled in Qt4

Browse source 
When trying to build wpa_gui (Qt4 version) from openembedded it fails
because Qt4 is compiled without session manager and thus wpa_gui fails
to compile.

I attached a patch, that enables compiling without Session Manager (via
preprocessor) if it is not compiled into Qt4; otherwise, it behaves as
it does right now.

I checked to build on my host (Debian unstable, Session Manager
enabled) and openembedded (Session Manager disabled).
This commit is contained in:
Christian Rüb 2009-11-16 13:20:53 +02:00 committed by Jouni Malinen
parent 33417cd75c
commit 1545457e04
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
wpa_supplicant/wpa_gui-qt4/main.cpp
View file

@ -24,7 +24,9 @@ class WpaGuiApp : public QApplication
public: public:
WpaGuiApp(int &argc, char **argv); WpaGuiApp(int &argc, char **argv);
#ifndef QT_NO_SESSIONMANAGER
virtual void saveState(QSessionManager &manager); virtual void saveState(QSessionManager &manager);
#endif
WpaGui *w; WpaGui *w;
}; };
@ -33,11 +35,13 @@ WpaGuiApp::WpaGuiApp(int &argc, char **argv) : QApplication(argc, argv)
{ {
} }
#ifndef QT_NO_SESSIONMANAGER
void WpaGuiApp::saveState(QSessionManager &manager) void WpaGuiApp::saveState(QSessionManager &manager)
{ {
QApplication::saveState(manager); QApplication::saveState(manager);
w->saveState(); w->saveState();
} }
#endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])

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

@ -147,6 +147,7 @@ WpaGui::WpaGui(QApplication *_app, QWidget *parent, const char *, Qt::WFlags)
parse_argv(); parse_argv();
#ifndef QT_NO_SESSIONMANAGER
if (app->isSessionRestored()) { if (app->isSessionRestored()) {
QSettings settings("wpa_supplicant", "wpa_gui"); QSettings settings("wpa_supplicant", "wpa_gui");
settings.beginGroup("state"); settings.beginGroup("state");
@ -155,6 +156,7 @@ WpaGui::WpaGui(QApplication *_app, QWidget *parent, const char *, Qt::WFlags)
startInTray = settings.value("in_tray").toBool(); startInTray = settings.value("in_tray").toBool();
settings.endGroup(); settings.endGroup();
} }
#endif
if (QSystemTrayIcon::isSystemTrayAvailable()) if (QSystemTrayIcon::isSystemTrayAvailable())
createTrayIcon(startInTray); createTrayIcon(startInTray);
@ -1721,6 +1723,7 @@ void WpaGui::addInterface()
} }
#ifndef QT_NO_SESSIONMANAGER
void WpaGui::saveState() void WpaGui::saveState()
{ {
QSettings settings("wpa_supplicant", "wpa_gui"); QSettings settings("wpa_supplicant", "wpa_gui");
@ -1729,3 +1732,4 @@ void WpaGui::saveState()
settings.setValue("in_tray", inTray); settings.setValue("in_tray", inTray);
settings.endGroup(); settings.endGroup();
} }
#endif

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

@ -40,7 +40,9 @@ public:
virtual void disableNetwork(const QString &sel); virtual void disableNetwork(const QString &sel);
virtual int getNetworkDisabled(const QString &sel); virtual int getNetworkDisabled(const QString &sel);
void setBssFromScan(const QString &bssid); void setBssFromScan(const QString &bssid);
#ifndef QT_NO_SESSIONMANAGER
void saveState(); void saveState();
#endif
public slots: public slots:
virtual void parse_argv(); virtual void parse_argv();