From b4f1dcca0d00bb1585473403e8e0410b980e3fd4 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Tue, 22 Jan 2008 18:42:34 +0000 Subject: [PATCH] now it compiles under Linux but does not link correctly --- configure.in | 11 +++++++---- src/llconserverdlg.cpp | 18 +++--------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/configure.in b/configure.in index 42fad4a0..52b21280 100755 --- a/configure.in +++ b/configure.in @@ -21,7 +21,7 @@ dnl Configuration Arguments AC_ARG_ENABLE( sound,[ --enable-sound generic sound support], enable_sound=$enableval, enable_sound=yes) -AC_ARG_WITH( qt4dir,[ --with-qtdir=path to QT],QT4DIR=$withval) +dnl AC_ARG_WITH( qt4dir,[ --with-qtdir=path to QT],QT4DIR=$withval) AC_CHECK_HEADER(sys/asoundlib.h, , enable_sound=no) @@ -47,7 +47,6 @@ AC_LANG(C++) dnl QT4 ------------------------------------------------------------------------- dnl The QT4 check code was taken from the FreeMat-3.0 code by Samit Basu PKG_CHECK_MODULES(QT, QtCore QtGui QtNetwork >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no") -foo=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/g'` if test "x$HAVE_QT4" = "xyes"; then dnl Check needed because in some cases the QtGui includedir dnl doesn't contain the subsystem dir. @@ -71,8 +70,12 @@ if test "x$HAVE_QT4" = "xyes"; then AC_MSG_ERROR([QT4 uic is required.]) fi fi -FOO=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/' | sed -e 's/-L.*//'` -LDFLAGS="$LDFLAGS $FOO" +dnl FOO=`echo $QT_LIBS | sed -e 's/-L/-Wl,-rpath,/' | sed -e 's/-L.*//'` +dnl LDFLAGS="$LDFLAGS $FOO" + +LDFLAGS="-L/usr/lib $LDFLAGS" + +dnl AC_MSG_NOTICE([Set LDFLAGS... $LDFLAGS]) AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS]) AC_SUBST(QT_CFLAGS) diff --git a/src/llconserverdlg.cpp b/src/llconserverdlg.cpp index 8d747ce9..091daa31 100755 --- a/src/llconserverdlg.cpp +++ b/src/llconserverdlg.cpp @@ -61,9 +61,7 @@ CLlconServerDlg::CLlconServerDlg ( CServer* pNServP, QWidget* parent ) for ( int i = MAX_NUM_CHANNELS - 1; i >= 0; i-- ) { vecpListViewItems[i] = new CServerListViewItem ( ListViewClients ); -#ifndef _WIN32 - vecpListViewItems[i]->setVisible ( false ); -#endif + vecpListViewItems[i]->setHidden ( false ); } // Init timing jitter text label @@ -132,21 +130,11 @@ void CLlconServerDlg::OnTimer() QString().setNum ( double ( veciNetwOutBlSiFact[i] * MIN_BLOCK_DURATION_MS), 'f', 2 ) ); -#ifndef _WIN32 - vecpListViewItems[i]->setVisible ( true ); -#endif + vecpListViewItems[i]->setHidden ( true ); } else { -#ifdef _WIN32 - // remove text for Windows version - vecpListViewItems[i]->setText ( 0, "" ); - vecpListViewItems[i]->setText ( 1, "" ); - vecpListViewItems[i]->setText ( 4, "" ); - vecpListViewItems[i]->setText ( 5, "" ); -#else - vecpListViewItems[i]->setVisible ( false ); -#endif + vecpListViewItems[i]->setHidden ( false ); } }