summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-04-02 12:04:53 (UTC)
committer mickeyl <mickeyl>2003-04-02 12:04:53 (UTC)
commit617523539b2ac77a97db427ba218b5951267410d (patch) (side-by-side diff)
tree415b9365e1c328b798dfc55390649fb363a6d8a9
parent911a05806c4cce85750f3bd9bca84e18162cb739 (diff)
downloadopie-617523539b2ac77a97db427ba218b5951267410d.zip
opie-617523539b2ac77a97db427ba218b5951267410d.tar.gz
opie-617523539b2ac77a97db427ba218b5951267410d.tar.bz2
- only build the lib subdir in the standalone build
- corrent driver-detection order
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp2
-rw-r--r--noncore/net/wellenreiter/wellenreiter.pro3
2 files changed, 3 insertions, 2 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp
index e287b47..59c2a61 100644
--- a/noncore/net/wellenreiter/gui/configwindow.cpp
+++ b/noncore/net/wellenreiter/gui/configwindow.cpp
@@ -47,34 +47,34 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
if ( it.current()->isWireless() )
interfaceName->insertItem( it.current()->name() );
++it;
}
// try to guess device type
QFile m( "/proc/modules" );
if ( m.open( IO_ReadOnly ) )
{
int devicetype(0);
QString line;
QTextStream modules( &m );
while( !modules.atEnd() && !devicetype )
{
modules >> line;
if ( line.contains( "cisco" ) ) devicetype = 1;
- else if ( line.contains( "wlan" ) ) devicetype = 2;
else if ( line.contains( "hostap" ) ) devicetype = 3;
+ else if ( line.contains( "prism" ) ) devicetype = 2;
else if ( line.contains( "orinoco" ) ) devicetype = 4;
}
if ( devicetype )
{
deviceType->setCurrentItem( devicetype );
qDebug( "Wellenreiter: guessed device type to be %d", devicetype );
}
}
#ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here
QPushButton* okButton = new QPushButton( "ok", this );
okButton->show();
Layout5_2->addWidget( okButton ); //FIXME: rename this in configbase.ui
connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) );
#endif
diff --git a/noncore/net/wellenreiter/wellenreiter.pro b/noncore/net/wellenreiter/wellenreiter.pro
index 6fe49c3..eb60c4a 100644
--- a/noncore/net/wellenreiter/wellenreiter.pro
+++ b/noncore/net/wellenreiter/wellenreiter.pro
@@ -1,13 +1,14 @@
TEMPLATE = subdirs
-unix:SUBDIRS = lib gui
!contains( platform, x11 ) {
message( Configuring Wellenreiter for build on Opie )
+ SUBDIRS = gui
include ( $(OPIEDIR)/include.pro )
}
contains( platform, x11 ) {
message( Configuring Wellenreiter for build on Qt/X11 )
+ SUBDIRS = lib gui
system( mkdir -p $OPIEDIR/lib $OPIEDIR/bin $OPIEDIR/share/pics )
}